Merge branch 'pivotal-cf:main' into main

pivotal-cf · Dec 5, 2024 · c22bdec · c22bdec
2 parents 7f12eba + 8273461
commit c22bdec
Show file tree

Hide file tree

Showing 69 changed files with 764 additions and 435 deletions.
diff --git a/.github/workflows/create-debugging-artifact.yml b/.github/workflows/create-debugging-artifact.yml
@@ -40,7 +40,7 @@ jobs:
         env:
           RELEEN_GITHUB_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
         run: |
-          export GITHUB_TOKEN="${RELEEN_GITHUB_TOKEN}"
+          export GITHUB_ACCESS_TOKEN="${RELEEN_GITHUB_TOKEN}"
           go test ./...
 
       - name: Acceptance Tests
@@ -49,7 +49,7 @@ jobs:
           RELEEN_GITHUB_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
         run: |
           set -euo pipefail
-          export GITHUB_TOKEN="${RELEEN_GITHUB_TOKEN}"
+          export GITHUB_ACCESS_TOKEN="${RELEEN_GITHUB_TOKEN}"
               
           set -x
           go test --run '(using_kiln|baking_a_tile|generating_release_notes|updating_)' \

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -27,17 +27,16 @@ jobs:
 
       - name: Build
         run: go build ./...
-        
+
       - name: Setup SSH
         uses: webfactory/[email protected]
         with:
           ssh-private-key: ${{ secrets.RELENG_CI_BOT_KEY }}
 
       - name: Unit Test
         env:
-          RELEEN_GITHUB_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
+          GITHUB_ACCESS_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
         run: |
-          export GITHUB_TOKEN="${RELEEN_GITHUB_TOKEN}"
           go test --covermode=atomic --coverprofile=kiln-${{github.sha}}-unit-test-code-coverage.out ./...
 
       - name: Archive Unit Test Code Coverage Output
@@ -49,14 +48,13 @@ jobs:
       - name: Acceptance Tests
         env:
           CGO_ENABLED: '0'
-          RELEEN_GITHUB_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
+          GITHUB_ACCESS_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
         run: |
           set -euo pipefail
-          export GITHUB_TOKEN="${RELEEN_GITHUB_TOKEN}"
 
           set -x
           go test -v --timeout 24h --tags acceptance github.com/pivotal-cf/kiln/internal/acceptance/workflows
-          
+
           git reset --hard HEAD
 
       - name: Login to Docker Hub
@@ -76,7 +74,8 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           distribution: goreleaser
-          version: latest
-          args: release --rm-dist
+          version: "~> v1"
+          args: release --clean
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -50,7 +50,7 @@ jobs:
           RELEEN_GITHUB_TOKEN: ${{ secrets.RELEEN_GITHUB_TOKEN }}
         run: |
           set -euo pipefail
-          export GITHUB_TOKEN="${RELEEN_GITHUB_TOKEN}"
+          export GITHUB_ACCESS_TOKEN="${RELEEN_GITHUB_TOKEN}"
 
           set -x
           go test -v --timeout 15m --tags acceptance github.com/pivotal-cf/kiln/internal/acceptance/workflows
diff --git a/HomebrewFormula/kiln.rb b/HomebrewFormula/kiln.rb
@@ -5,20 +5,20 @@
 class Kiln < Formula
   desc ""
   homepage ""
-  version "0.94.0"
+  version "0.99.0"
 
   on_macos do
     on_intel do
-      url "https://github.com/pivotal-cf/kiln/releases/download/v0.94.0/kiln-darwin-amd64-0.94.0.tar.gz"
-      sha256 "ff8773f4710529fc490da05a89eb239ede91ffa462f4a410bc3a397996405d49"
+      url "https://github.com/pivotal-cf/kiln/releases/download/v0.99.0/kiln-darwin-amd64-0.99.0.tar.gz"
+      sha256 "c30645c3aef2df1442ec889ce812d4c1dc1d40a3d3bc2072e361c1bbc3b634f8"
 
       def install
         bin.install "kiln"
       end
     end
     on_arm do
-      url "https://github.com/pivotal-cf/kiln/releases/download/v0.94.0/kiln-darwin-arm64-0.94.0.tar.gz"
-      sha256 "96dd21ef3c1fde148ef78cec36cc99100e043f616d81f45240217842f43e0f52"
+      url "https://github.com/pivotal-cf/kiln/releases/download/v0.99.0/kiln-darwin-arm64-0.99.0.tar.gz"
+      sha256 "8256d4eccfbffd690c6b2fe0706e951b9696adc3eddf9b819dc0d9c6a36941e9"
 
       def install
         bin.install "kiln"
@@ -29,8 +29,8 @@ def install
   on_linux do
     on_intel do
       if Hardware::CPU.is_64_bit?
-        url "https://github.com/pivotal-cf/kiln/releases/download/v0.94.0/kiln-linux-amd64-0.94.0.tar.gz"
-        sha256 "fbe2e5c08f90cd060d50ebe7d426d954d34360a1a6c77f1112db25524cee1ce0"
+        url "https://github.com/pivotal-cf/kiln/releases/download/v0.99.0/kiln-linux-amd64-0.99.0.tar.gz"
+        sha256 "cff6801eb01dc4a983c723c927d4beeffcab796b504fa3d66f4dafd2afb77f20"
 
         def install
           bin.install "kiln"

diff --git a/README.md b/README.md
@@ -658,6 +658,7 @@ stemcell_criteria:
   - type: github
     id: optional-unique-name-defaults-to-github-org-name
     org: the-github-org
+    endpoint: $(variable "github_host")
     github_token: $(variable "github_token")
 ```
 

diff --git a/TILE_AUTHOR_GUIDE.md b/TILE_AUTHOR_GUIDE.md
@@ -358,7 +358,7 @@ release_sources:
   - type: "github"
     id: crhntr # (optional) the default ID in this case is the value of org
     org: "crhntr"
-    github_token: $(variable "github_token")
+    github_token: $(variable "github_access_token")
 ```
 
 **`github_token` is always required even for public repositories because we make API requests**
@@ -371,10 +371,10 @@ You will need to add the following flag to most commands:
 
 ```
 # Optional helper
-export GITHUB_TOKEN="$(gh auth status --show-token 2>&1 | grep 'Token:' | awk '{print $NF}')"
+export GITHUB_ACCESS_TOKEN="$(gh auth status --show-token 2>&1 | grep 'Token:' | awk '{print $NF}')"
 
 # Example Kiln variable flag
-kiln fetch --variable="github_token=${GITHUB_TOKEN}"
+kiln fetch --variable="github_access_token=${GITHUB_ACCESS_TOKEN}"
 ```
 
 The value of `remote_path` in the BOSH release tarball lock is a URL.

diff --git a/go.mod b/go.mod
@@ -1,6 +1,8 @@
 module github.com/pivotal-cf/kiln
 
-go 1.22.6
+go 1.23
+
+toolchain go1.23.2
 
 require (
 	github.com/Masterminds/semver/v3 v3.2.1
@@ -17,26 +19,25 @@ require (
 	github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.11.0
-	github.com/google/go-github/v40 v40.0.0
 	github.com/google/go-github/v50 v50.2.0
 	github.com/julienschmidt/httprouter v1.3.0
 	github.com/masterminds/sprig v2.22.0+incompatible
-	github.com/maxbrunsfeld/counterfeiter/v6 v6.5.0
+	github.com/maxbrunsfeld/counterfeiter/v6 v6.10.0
 	github.com/migueleliasweb/go-github-mock v0.0.16
 	github.com/moby/buildkit v0.12.5
 	github.com/onsi/ginkgo v1.16.5
-	github.com/onsi/gomega v1.27.10
+	github.com/onsi/gomega v1.34.2
 	github.com/opencontainers/image-spec v1.1.0
 	github.com/pivotal-cf-experimental/gomegamatchers v0.0.0-20180326192815-e36bfcc98c3a
 	github.com/pivotal-cf/go-pivnet/v7 v7.0.2
 	github.com/pivotal-cf/jhanda v0.0.0-20200619200912-8de8eb943a43
 	github.com/pivotal-cf/om v0.0.0-20230707145702-e2ef8fd451b1
 	github.com/snabb/httpreaderat v1.0.1
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/crypto v0.21.0
+	golang.org/x/crypto v0.28.0
 	golang.org/x/oauth2 v0.16.0
-	golang.org/x/sync v0.6.0
-	golang.org/x/term v0.18.0
+	golang.org/x/sync v0.8.0
+	golang.org/x/term v0.25.0
 	gopkg.in/yaml.v2 v2.4.0
 	gopkg.in/yaml.v3 v3.0.1
 )
@@ -69,7 +70,7 @@ require (
 	github.com/fatih/color v1.15.0 // indirect
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
-	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
@@ -119,17 +120,17 @@ require (
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/sdk v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/mod v0.15.0 // indirect
-	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
+	golang.org/x/tools v0.26.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240221002015-b0ce06bbee7c // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240213162025-012b6fc9bca9 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
 	google.golang.org/grpc v1.62.0 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect