Skip to content

Commit 7857dc6

Browse files
committed
feat: Updated hello tile and bosh repo references
- Updated Chris test hello tile and hello release repo references to point to releen - Updated upload-artifact github action to v4 - Pinned golangci-lint-action to v6.3.0 because of an error in the latest version JIRA Link: https://vmw-jira.broadcom.net/browse/TNZ-32601 [TNZ-32601] - [Kiln]: Stop using Chris's hello release and tile repos for testing Date: 27-Feb-2025 Authored-by: Ramkumar Vengadakrishnan <[email protected]>
1 parent 9d5b291 commit 7857dc6

23 files changed

+79
-79
lines changed

.github/workflows/create-debugging-artifact.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ jobs:
5858
5959
git reset --hard HEAD
6060
61-
- uses: actions/upload-artifact@v3
61+
- uses: actions/upload-artifact@v4
6262
with:
6363
path: ./kiln

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
go test --covermode=atomic --coverprofile=kiln-${{github.sha}}-unit-test-code-coverage.out ./...
4141
4242
- name: Archive Unit Test Code Coverage Output
43-
uses: actions/upload-artifact@v3
43+
uses: actions/upload-artifact@v4
4444
with:
4545
name: Unit Test Code Coverage Output
4646
path: kiln-${{github.sha}}-unit-test-code-coverage.out

.github/workflows/test.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
go-version-file: go.mod
2121

2222
- name: golangci-lint
23-
uses: golangci/golangci-lint-action@v6
23+
uses: golangci/golangci-lint-action@v6.3.0
2424

2525
- name: Ensure Generate Succeeds and Does Not Make Changes
2626
run: |
@@ -39,7 +39,7 @@ jobs:
3939
run: go test --covermode=atomic --coverprofile=kiln-${{ github.sha }}-unit-test-code-coverage.out ./...
4040

4141
- name: Archive Unit Test Code Coverage Output
42-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
4343
with:
4444
name: Unit Test Code Coverage Output
4545
path: kiln-${{ github.sha }}-unit-test-code-coverage.out

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ an opinionated folder structure and templating capabilities. It is designed to b
77
both in CI environments and in command-line to produce a tile.
88

99
More information for those just getting started can be found in the [Ops Manager Tile Developer Guide](https://docs.vmware.com/en/Tile-Developer-Guide/3.0/tile-dev-guide/index.html) .
10-
Looking at an [example kiln tile](https://github.com/crhntr/hello-tile/tree/main) may also be helpful
10+
Looking at an [example kiln tile](https://github.com/releen/hello-tile/tree/main) may also be helpful
1111

1212
## Installation
1313

@@ -770,10 +770,10 @@ releases:
770770
remote_source: unique-name # this could be artifactory or s3
771771
remote_path: bosh-releases/compiled/backup-and-restore-sdk-1.18.84-ubuntu-jammy-1.179.tgz
772772
- name: hello-release
773-
sha1: 06500a2002f6e14f6c258b7ee7044761a28d3d5a
774-
version: 0.1.5
773+
sha1: d7de88ab98d7d61d0a4e660c8fff76727817c059
774+
version: 0.4.0
775775
remote_source: the-github-org
776-
remote_path: https://github.com/crhntr/hello-release/releases/download/v0.1.5/hello-release-v0.1.5.tgz
776+
remote_path: https://github.com/releen/hello-release/releases/download/0.4.0/hello-release-0.4.0.tgz
777777
stemcell_criteria:
778778
os: ubuntu-xenial
779779
version: "621.0"

TILE_AUTHOR_GUIDE.md

+9-9
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ This guide intends to be more opinionated while the README.me is more general.
2323
- [TanzuNet Release Publication](#kiln-publish)
2424
- [Importing Go Source Code](#go-import-kiln)
2525
#### Helpful external links
26-
- [Metadata Testing Example](https://github.com/crhntr/hello-tile/blob/main/test/manifest/manifest_test.go)
26+
- [Metadata Testing Example](https://github.com/releen/hello-tile/blob/main/test/manifest/manifest_test.go)
2727

28-
Again, see [hello-tile](https://github.com/crhntr/hello-tile) (non-VMware employees) or the TAS repo (VMware employees) for tile source code that kiln "just works" with.
28+
Again, see [hello-tile](https://github.com/releen/hello-tile) (non-VMware employees) or the TAS repo (VMware employees) for tile source code that kiln "just works" with.
2929

3030
## Bootstrapping a tile repository
3131

@@ -37,7 +37,7 @@ mkdir -p bosh_variables forms instance_groups jobs migrations properties release
3737
touch {bosh_variables,forms,instance_groups,jobs,migrations,properties,releases,runtime_configs}/.gitkeep
3838

3939
# Add a tile image
40-
curl -L -o icon.png "https://github.com/crhntr/hello-tile/blob/main/icon.png?raw=true"
40+
curl -L -o icon.png "https://github.com/releen/hello-tile/blob/main/icon.png?raw=true"
4141

4242
# Add a version file (this is the default location Kiln reads from)
4343
echo '0.1.0' > 'version'
@@ -125,8 +125,8 @@ Other functions:
125125
- `select` _TODO function documentation_
126126
- `regexReplaceAll` _TODO function documentation_
127127

128-
See the [crhntr/hello-tile/base.yml](https://github.com/pivotal/hello-tile/blob/c6b59dcb1118c9b2f5d4fbf836842ce4033baa80/base.yml#L29C1-L30C1) for some use of the above functions.
129-
The property definition in [crhntr/hello-tile/properties/hello.yml](https://github.com/pivotal/hello-tile/blob/c6b59dcb1118c9b2f5d4fbf836842ce4033baa80/properties/hello.yml#L2-L5)
128+
See the [releen/hello-tile/base.yml](https://github.com/releen/hello-tile/blob/main/base.yml) for some use of the above functions.
129+
The property definition in [releen/hello-tile/properties/hello.yml](https://github.com/releen/hello-tile/blob/main/properties/hello.yml)
130130
in referenced in `base.yml` using `$( property "port" )`.
131131
Most other product template part functions behave similarly.
132132

@@ -149,8 +149,8 @@ The Kiln way is to
149149

150150
While the following examples start from empty directories and mostly use S3 and BOSH.io.
151151
There are similar simple scripts for a small test tile illustrating similar usage patterns to the follwoing example.
152-
See [hello-tile](https://github.com/crhntr/hello-tile).
153-
Hello Tile consumes a single custom BOSH Release, [hello-release](https://github.com/crhntr/hello-release), from a GitHub release.
152+
See [hello-tile](https://github.com/releen/hello-tile).
153+
Hello Tile consumes a single custom BOSH Release, [hello-release](https://github.com/releen/hello-release), from a GitHub release.
154154
It does not upload the release to TanzuNet but adds the built tile to a GitHub Release.
155155

156156
#### <a id="kiln-fetch-example"></a> **EXAMPLE** Using Kiln to Download BOSH Release Tarballs
@@ -356,8 +356,8 @@ To download BOSH Release Tarballs from GitHub Releases, add the following
356356
```yaml
357357
release_sources:
358358
- type: "github"
359-
id: crhntr # (optional) the default ID in this case is the value of org
360-
org: "crhntr"
359+
id: releen # (optional) the default ID in this case is the value of org
360+
org: "releen"
361361
github_token: $(variable "github_access_token")
362362
```
363363

internal/acceptance/workflows/baking_a_tile.feature

+5-5
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ Feature: As a developer, I want to bake a tile
1111
| metadata/metadata.yml |
1212
| migrations/v1 |
1313
| releases/bpm-1.2.12.tgz |
14-
| releases/hello-release-0.2.3.tgz |
14+
| releases/hello-release-0.4.0.tgz |
1515
And "bake_records/0.2.0-dev.json" contains substring: "version": "0.2.0-dev"
16-
And "bake_records/0.2.0-dev.json" contains substring: "source_revision": "896c44a006a24d8601ed09fd871b1a4423636d77"
16+
And "bake_records/0.2.0-dev.json" contains substring: "source_revision": "f576bdedff1f014d550a26bf19effd28293c09e1"
1717
And "bake_records/0.2.0-dev.json" contains substring: "tile_directory": "."
1818
And "bake_records/0.2.0-dev.json" contains substring: "kiln_version": "0.0.0+acceptance-tests"
19-
And "bake_records/0.2.0-dev.json" contains substring: "file_checksum": "6754bb95193e42cd5706f810c3fdb1beead88e2a01601bb222e3e98818f90e8a"
20-
And "tile-0.2.0-dev.pivotal" has sha256 sum "6754bb95193e42cd5706f810c3fdb1beead88e2a01601bb222e3e98818f90e8a"
19+
And "bake_records/0.2.0-dev.json" contains substring: "file_checksum": "b8d1e2f328b204db813a85a8cd98dd70c1148b7dde4137c12fae69d52e673bfb"
20+
And "tile-0.2.0-dev.pivotal" has sha256 sum "b8d1e2f328b204db813a85a8cd98dd70c1148b7dde4137c12fae69d52e673bfb"
2121

2222
Scenario: it reads directory configuration from Kilnfile
2323
Given I have a tile source directory "testdata/tiles/non-standard-paths"
@@ -42,4 +42,4 @@ Feature: As a developer, I want to bake a tile
4242
Then a Tile is created
4343
And the Tile contains
4444
| metadata/metadata.yml |
45-
| releases/bpm-1.1.21.tgz |
45+
| releases/bpm-1.1.21.tgz |

internal/acceptance/workflows/generating_release_notes.feature

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ Feature: As a robot, I want to generate release notes
44

55
And I execute git tag v0.1.3
66

7-
And GitHub repository "crhntr/hello-release" has release with tag "v0.1.5"
7+
And GitHub repository "releen/hello-release" has release with tag "0.5.0"
88
And I invoke kiln
99
| update-release |
1010
| --name=hello-release |
11-
| --version=v0.1.5 |
11+
| --version=0.5.0 |
1212
| --without-download |
1313
| --variable=github_access_token="${GITHUB_ACCESS_TOKEN}" |
1414
And I write file "version"
@@ -18,7 +18,7 @@ Feature: As a robot, I want to generate release notes
1818
And I execute git show
1919
And I execute git tag v0.1.4
2020

21-
And I execute git remote add origin git@github.com:crhntr/hello-tile
21+
And I execute git remote add origin git@github.com:releen/hello-tile
2222

2323
# it does not contain 0.1.4 release header only 0.1.3
2424
And "notes/release_notes.md.erb" has regex matches: id='(?P<version>[\d\.]+)'
@@ -46,14 +46,14 @@ Feature: As a robot, I want to generate release notes
4646
And "notes/release_notes.md.erb" contains substring: **[Bug Fix]** Index page has inconsistent whitespace
4747

4848
# it contains the component release note
49-
And "notes/release_notes.md.erb" contains substring: "**[Fix]**\n The HTML had inconsistent spacing"
49+
And "notes/release_notes.md.erb" contains substring: "**[Fix]**: The HTML had inconsistent spacing"
5050

5151
# the table contains the name/versions
5252
And "notes/release_notes.md.erb" has regex matches: (?mU)<tr><td>(?P<release_name>.*)</td><td>(?P<release_version>.*)</td>
5353
| release_name | release_version |
5454
| ubuntu-xenial stemcell | 621.0 |
5555
| bpm | 1.1.18 |
56-
| hello-release | 0.1.5 |
56+
| hello-release | 0.5.0 |
5757
| ubuntu-xenial stemcell | 621.0 |
5858
| bpm | 1.1.18 |
59-
| hello-release | v0.1.4 |
59+
| hello-release | 0.4.5 |

internal/acceptance/workflows/glaze.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Feature: As a maintainer, I want to pin all BOSH Releases
33
Given I have a tile source directory "testdata/tiles/v2"
44
When I invoke kiln
55
| glaze |
6-
Then the Kilnfile version for release "hello-release" is "0.2.3"
6+
Then the Kilnfile version for release "hello-release" is "0.4.0"
77
And the Kilnfile version for release "bpm" is "1.2.12"
88
And the Kilnfile version for the stemcell is "1.329"
99

internal/acceptance/workflows/scenario/step_funcs_github_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
func Test_githubRepoHasReleaseWithTag(t *testing.T) {
1212
t.Skip("skipping this test because it requires a github token to run. ")
1313
if isRunningInCI() {
14-
t.Skip("skip this step in CI. GitHub action credentials do not have access to crhntr/hello-release")
14+
t.Skip("skip this step in CI. GitHub action credentials do not have access to releen/hello-release")
1515
}
1616
setup := func(t *testing.T) (context.Context, Gomega) {
1717
ctx := context.Background()
@@ -31,13 +31,13 @@ func Test_githubRepoHasReleaseWithTag(t *testing.T) {
3131

3232
t.Run("release exists", func(t *testing.T) {
3333
ctx, please := setup(t)
34-
err := githubRepoHasReleaseWithTag(ctx, "crhntr", "hello-release", "v0.1.5")
34+
err := githubRepoHasReleaseWithTag(ctx, "releen", "hello-release", "0.4.5")
3535
please.Expect(err).NotTo(HaveOccurred())
3636
})
3737

3838
t.Run("release does not exist", func(t *testing.T) {
3939
ctx, please := setup(t)
40-
err := githubRepoHasReleaseWithTag(ctx, "crhntr", "hello-release", "v99.99.99-banana")
40+
err := githubRepoHasReleaseWithTag(ctx, "releen", "hello-release", "v99.99.99-banana")
4141
please.Expect(err).To(HaveOccurred())
4242
})
4343
}

internal/acceptance/workflows/scenario/step_funcs_tile_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func Test_theLockSpecifiesVersionForRelease(t *testing.T) {
2323

2424
t.Run("it matches the release version", func(t *testing.T) {
2525
ctx, please := setup(t)
26-
err := theLockSpecifiesVersionForRelease(ctx, "0.2.3", "hello-release")
26+
err := theLockSpecifiesVersionForRelease(ctx, "0.4.0", "hello-release")
2727
please.Expect(err).NotTo(HaveOccurred())
2828
})
2929

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
slug: crhntr-hello
2+
slug: releen-hello
33
release_sources:
44
- type: github
5-
org: crhntr
5+
org: releen
66
github_token: $(variable "github_access_token")
77
- type: bosh.io
88
releases:
99
- name: bpm
1010
- name: hello-release
11-
github_repository: https://github.com/crhntr/hello-release
11+
github_repository: https://github.com/releen/hello-release

internal/acceptance/workflows/testdata/tiles/v1/Kilnfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ releases:
55
remote_source: bosh.io
66
remote_path: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.1.18
77
- name: hello-release
8-
sha1: e893386c9fbd34f3e136941eb1841e044a0bed28
9-
version: v0.1.4
10-
remote_source: crhntr
11-
remote_path: https://github.com/crhntr/hello-release/releases/download/v0.1.4/hello-release-v0.1.4.tgz
8+
sha1: 695e3721bc9459ce197909dd3e99680e9d57d8f0
9+
version: 0.4.5
10+
remote_source: releen
11+
remote_path: https://github.com/releen/hello-release/releases/download/0.4.5/hello-release-0.4.5.tgz
1212
stemcell_criteria:
1313
os: ubuntu-xenial
1414
version: "621.0"

internal/acceptance/workflows/testdata/tiles/v1/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# A [Ops Manager Tile](https://docs.pivotal.io/tiledev/2-10/index.html) wrapping [Hello Release](https://github.com/crhntr/hello-release)
1+
# A [Ops Manager Tile](https://docs.pivotal.io/tiledev/2-10/index.html) wrapping [Hello Release](https://github.com/releen/hello-release)
22

33
This is an example for [Kiln](https://github.com/pivotal-cf/kiln).
44

internal/acceptance/workflows/testdata/tiles/v1/notes/release_notes.md.erb

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ title: Hello Tile Example v0.1 Release Notes
33
owner: Christopher Hunter
44
---
55

6-
This topic contains release notes [Hello Tile](https://github.com/crhntr/hello-tile).
6+
This topic contains release notes [Hello Tile](https://github.com/releen/hello-tile).
77

88
## <a id='releases'></a> Releases
99

1010
### <a id='0.1.3'></a> 0.1.3
1111

1212
**Release Date:** 06/26/2022
1313

14-
* Bump hello-release to version `v0.1.4`
14+
* Bump hello-release to version `0.4.5`
1515

1616
<table border="1" class="nice">
1717
<thead>
@@ -24,7 +24,7 @@ This topic contains release notes [Hello Tile](https://github.com/crhntr/hello-t
2424
<tbody>
2525
<tr><td>ubuntu-xenial stemcell</td><td>621.0</td><td></td></tr>
2626
<tr><td>bpm</td><td>1.1.18</td><td></td></tr>
27-
<tr><td>hello-release</td><td>v0.1.4</td><td></td></tr>
27+
<tr><td>hello-release</td><td>0.4.5</td><td></td></tr>
2828
</tbody>
2929
</table>
3030

@@ -42,4 +42,4 @@ The tile deploys a VM with a server that responds to HTTP requests with a "Hello
4242

4343
### <a id='configurable-port'></a> Configurable Port
4444

45-
The HTTP port is configurable. It defaults to 8080.
45+
The HTTP port is configurable. It defaults to 8080.
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
---
2-
slug: crhntr-hello
2+
slug: releen-hello
33
release_sources:
44
- type: github
5-
org: crhntr
5+
org: releen
66
github_token: $(variable "github_access_token")
77
- type: bosh.io
88
releases:
99
- name: bpm
1010
- name: hello-release
11-
github_repository: https://github.com/crhntr/hello-release
11+
github_repository: https://github.com/releen/hello-release
1212
stemcell_criteria:
1313
os: ubuntu-jammy
14-
version: "*"
14+
version: "*"

internal/acceptance/workflows/testdata/tiles/v2/Kilnfile.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ releases:
55
remote_source: bosh.io
66
remote_path: https://bosh.io/d/github.com/cloudfoundry/bpm-release?v=1.2.12
77
- name: hello-release
8-
sha1: a0f2747fd22796d5fbbe036d0d8786e76a2ac651
9-
version: 0.2.3
10-
remote_source: crhntr
11-
remote_path: https://github.com/crhntr/hello-release/releases/download/v0.2.3/hello-release-v0.2.3.tgz
8+
sha1: d7de88ab98d7d61d0a4e660c8fff76727817c059
9+
version: 0.4.0
10+
remote_source: releen
11+
remote_path: https://github.com/releen/hello-release/releases/download/0.4.0/hello-release-0.4.0.tgz
1212
stemcell_criteria:
1313
os: ubuntu-jammy
1414
version: "1.329"

internal/acceptance/workflows/testdata/tiles/v2/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# A [Ops Manager Tile](https://docs.pivotal.io/tiledev/2-10/index.html) wrapping [Hello Release](https://github.com/crhntr/hello-release) [![Release](https://github.com/crhntr/hello-tile/actions/workflows/release.yml/badge.svg)](https://github.com/crhntr/hello-tile/actions/workflows/release.yml)
1+
# A [Ops Manager Tile](https://docs.pivotal.io/tiledev/2-10/index.html) wrapping [Hello Release](https://github.com/releen/hello-release) [![Release](https://github.com/releen/hello-tile/actions/workflows/release.yml/badge.svg)](https://github.com/releen/hello-tile/actions/workflows/release.yml)
22

33
This is an example for [Kiln](https://github.com/pivotal-cf/kiln).
44

internal/acceptance/workflows/testdata/tiles/v2/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
module github.com/crhntr/hello-tile
1+
module github.com/releen/hello-tile
22

33
go 1.22.6
44

internal/acceptance/workflows/updating_releases.feature

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Feature: As a dependabot, I want to update a BOSH Release
22
Scenario: Find a version on GitHub
33
Given I have a tile source directory "testdata/tiles/v2"
4-
And GitHub repository "crhntr/hello-release" has release with tag "v0.2.3"
5-
And I set the version constraint to "0.2.3" for release "hello-release"
4+
And GitHub repository "releen/hello-release" has release with tag "0.4.0"
5+
And I set the version constraint to "0.4.0" for release "hello-release"
66
When I invoke kiln
77
| find-release-version |
88
| --release=hello-release |
99
| --variable=github_access_token="${GITHUB_ACCESS_TOKEN}" |
10-
Then stdout contains substring: "0.2.3"
10+
Then stdout contains substring: "0.4.0"
1111

1212
Scenario: Find a version on bosh.io
1313
Given I have a tile source directory "testdata/tiles/v2"
@@ -22,16 +22,16 @@ Feature: As a dependabot, I want to update a BOSH Release
2222
Scenario: Update a component to a new release with download
2323
Given I have a tile source directory "testdata/tiles/v2"
2424
And the repository has no fetched releases
25-
And the Kilnfile.lock specifies version "0.2.3" for release "hello-release"
26-
And GitHub repository "crhntr/hello-release" has release with tag "0.3.0"
25+
And the Kilnfile.lock specifies version "0.4.0" for release "hello-release"
26+
And GitHub repository "releen/hello-release" has release with tag "0.5.0"
2727
When I invoke kiln
2828
| update-release |
2929
| --name=hello-release |
30-
| --version=0.3.0 |
30+
| --version=0.5.0 |
3131
| --variable=github_access_token="${GITHUB_ACCESS_TOKEN}" |
32-
Then the Kilnfile.lock specifies version "0.3.0" for release "hello-release"
32+
Then the Kilnfile.lock specifies version "0.5.0" for release "hello-release"
3333
And kiln validate succeeds
34-
And the "hello-release-0.3.0.tgz" release tarball exists
34+
And the "hello-release-0.5.0.tgz" release tarball exists
3535

3636
Scenario: Update a component to a new release without download
3737
Given I have a tile source directory "testdata/tiles/v2"

0 commit comments

Comments
 (0)