Merge branch 'main' into signingDocs

getporter · Jun 7, 2024 · 1d8aeff · 1d8aeff
2 parents f0626e3 + 39d28db
commit 1d8aeff
Show file tree

Hide file tree

Showing 15 changed files with 132 additions and 53 deletions.
diff --git a/.github/workflows/build_pipelinesrelease_template.yml b/.github/workflows/build_pipelinesrelease_template.yml
@@ -28,7 +28,7 @@ jobs:
       uses: actions/[email protected]
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Configure Agent
       run: go run mage.go ConfigureAgent
     - name: Native Build
@@ -49,7 +49,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Configure Agent
       run: go run mage.go ConfigureAgent
     - name: Cross Compile
@@ -68,7 +68,7 @@ jobs:
       uses: actions/[email protected]
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Configure Agent
       run: go run mage.go ConfigureAgent
     - name: Vet
@@ -86,7 +86,7 @@ jobs:
       uses: actions/[email protected]
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Configure Agent
       run: go run mage.go ConfigureAgent
     - name: Unit Test
@@ -110,7 +110,7 @@ jobs:
       uses: actions/[email protected]
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Download Cross-Compiled Porter Binaries
       uses: actions/[email protected]
       with:
@@ -139,7 +139,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Download Cross-Compiled Porter Binaries
       uses: actions/[email protected]
       with:
@@ -151,7 +151,12 @@ jobs:
       env:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         VERSION: ${{github.ref_name}}
-      run: mage PublishPorter PublishMixins
+      run: mage PublishPorter
+    - name: Publish Porter Mixins
+      env:
+        GITHUB_TOKEN: "${{ secrets.PUBLISH_TOKEN }}"
+        VERSION: ${{github.ref_name}}
+      run: mage PublishMixins
   publish-ghcr:
     env:
       DOCKER_REGISTRY: ${{inputs.registry}}
@@ -175,7 +180,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-go@v4
       with:
-        go-version: "${{ inputs.GOVERSION }}"
+        go-version: ${{ inputs.goVersion }}
     - name: Download Cross-Compiled Porter Binaries
       uses: actions/[email protected]
       with:
@@ -190,4 +195,5 @@ jobs:
         username: "${{ github.actor }}"
         password: "${{ secrets.GITHUB_TOKEN }}"
     - name: Publish Docker Images to ${{inputs.registry}}
-      run: PORTER_REGISTRY=${{inputs.registry}} mage PublishImages
+      run: PORTER_REGISTRY=${{inputs.registry}} mage PublishImages PublishServerMultiArchImages
+
diff --git a/.github/workflows/porter-canary.yml b/.github/workflows/porter-canary.yml
@@ -12,3 +12,4 @@ jobs:
       registry: ghcr.io/getporter
       shouldPublish: true
       skipTests: false
+    secrets: inherit
diff --git a/.github/workflows/porter-integration-pr.yml b/.github/workflows/porter-integration-pr.yml
@@ -124,3 +124,33 @@ jobs:
         PORTER_INTEG_FILE: uninstall_test.go
       run: go run mage.go -v TestIntegration
       shell: bash
+  signing_test_integ:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/[email protected]
+    - uses: actions/setup-go@v4
+      with:
+        go-version: "${{ env.GOVERSION }}"
+        cache: true
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+    - name: Docker Login
+      uses: docker/[email protected]
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Configure Agent
+      run: go run mage.go build
+      shell: bash
+    - name: Integration Test
+      env:
+        PORTER_INTEG_FILE: signing_test.go
+      run: go run mage.go -v TestIntegration
+      shell: bash
diff --git a/.github/workflows/porter-integration-release.yml b/.github/workflows/porter-integration-release.yml
@@ -163,3 +163,33 @@ jobs:
         PORTER_INTEG_FILE: uninstall_test.go
       run: go run mage.go -v TestIntegration
       shell: bash
+  signing_test_integ:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/[email protected]
+    - uses: actions/setup-go@v4
+      with:
+        go-version: "${{ env.GOVERSION }}"
+        cache: true
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+    - name: Cache Docker layers
+      uses: actions/cache@v3
+      with:
+        path: /tmp/.buildx-cache
+        key: ${{ runner.os }}-buildx-${{ github.sha }}
+    - name: Docker Login
+      uses: docker/[email protected]
+      with:
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Configure Agent
+      run: go run mage.go build
+      shell: bash
+    - name: Integration Test
+      env:
+        PORTER_INTEG_FILE: signing_test.go
+      run: go run mage.go -v TestIntegration
+      shell: bash
diff --git a/.github/workflows/porter-release.yml b/.github/workflows/porter-release.yml
@@ -13,4 +13,5 @@ jobs:
     with:
       registry: ghcr.io/getporter
       shouldPublish: true
-      skipTests: false
+      skipTests: false
+    secrets: inherit
diff --git a/.github/workflows/porter.yml b/.github/workflows/porter.yml
@@ -26,6 +26,17 @@ jobs:
     - name: Native Build
       run: go run mage.go build
       shell: bash
+    - name: Check if all doc changes have been pushed
+      run: |
+        if [ "$(git status --porcelain docs/)" ];
+        then
+          echo "There are changes to the documentation that have not been pushed! Please push the following files after build"
+          git status -s docs/
+          exit 1
+        else
+          echo "All documentation changes have been pushed"
+        fi
+      shell: bash
     - name: Publish Native Binaries
       uses: actions/[email protected]
       with:

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 [![porter](https://github.com/getporter/porter/actions/workflows/porter.yml/badge.svg?branch=main&event=push)](https://github.com/getporter/porter/actions/workflows/porter.yml)
 <a href="https://porter.sh/find-issue" alt="Find an issue to work on">
 <img src="https://img.shields.io/github/issues-search?label=%22help%20wanted%22%20issues&query=org%3Agetporter%20label%3A%22good%20first%20issue%22%2C%22help%20wanted%22%20no%3Aassignee" /></a>
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8720/badge)](https://www.bestpractices.dev/projects/8720)
 
 # Porter
 

diff --git a/build/protoc.Dockerfile b/build/protoc.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 RUN apt-get update && apt-get -y install protobuf-compiler
 RUN go install google.golang.org/protobuf/cmd/[email protected]
 RUN go install google.golang.org/grpc/cmd/[email protected]

diff --git a/go.mod b/go.mod
@@ -17,7 +17,7 @@ replace (
 )
 
 require (
-	get.porter.sh/magefiles v0.6.6
+	get.porter.sh/magefiles v0.6.7
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/PaesslerAG/jsonpath v0.1.1
 	github.com/carolynvs/aferox v0.3.0
@@ -45,7 +45,7 @@ require (
 	github.com/hashicorp/go-plugin v1.4.0
 	github.com/magefile/mage v1.15.0
 	github.com/mattn/go-colorable v0.1.13
-	github.com/mattn/go-isatty v0.0.19
+	github.com/mattn/go-isatty v0.0.20
 	github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/mmcdole/gofeed v1.3.0
@@ -65,17 +65,17 @@ require (
 	github.com/tidwall/sjson v1.2.5
 	github.com/xeipuuv/gojsonschema v1.2.0
 	go.mongodb.org/mongo-driver v1.13.1
-	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.51.0
-	go.opentelemetry.io/otel v1.26.0
+	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.52.0
+	go.opentelemetry.io/otel v1.27.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.26.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.26.0
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0
 	go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0
 	go.opentelemetry.io/otel/sdk v1.26.0
-	go.opentelemetry.io/otel/trace v1.26.0
+	go.opentelemetry.io/otel/trace v1.27.0
 	go.uber.org/zap v1.27.0
-	golang.org/x/sync v0.6.0
-	google.golang.org/grpc v1.63.2
+	golang.org/x/sync v0.7.0
+	google.golang.org/grpc v1.64.0
 	google.golang.org/protobuf v1.34.1
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473
@@ -222,22 +222,22 @@ require (
 	github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.44.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.51.0 // indirect
-	go.opentelemetry.io/otel/metric v1.26.0 // indirect
+	go.opentelemetry.io/otel/metric v1.27.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.2.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/crypto v0.23.0 // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/net v0.25.0 // indirect
-	golang.org/x/oauth2 v0.17.0 // indirect
+	golang.org/x/oauth2 v0.18.0 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/term v0.20.0 // indirect
 	golang.org/x/text v0.15.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240520151616-dc85e6b867a5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect