Merge branch 'main' into dependabot/go_modules/github.com/google/go-c…

…ontainerregistry-0.19.0
getporter · Feb 7, 2024 · cc383ed · cc383ed
2 parents 888fd5f + 4aac2b5
commit cc383ed
Show file tree

Hide file tree

Showing 28 changed files with 819 additions and 142 deletions.
diff --git a/.github/workflows/build-publish-from-fork.yaml b/.github/workflows/build-publish-from-fork.yaml
diff --git a/.github/workflows/build_pipelinesrelease_template.yml b/.github/workflows/build_pipelinesrelease_template.yml
@@ -91,34 +91,12 @@ jobs:
       run: mage TestUnit
       shell: bash
   Validate-integration_test:
-    env:
-      GHCR_IOGETPORTER_DOCKER_REGISTRY: https://ghcr.io
-      GHCR_IOGETPORTER_DOCKER_USERNAME: getporterbot
     name: Integration Test
     needs:
     - Validate-build
-    runs-on: ubuntu-latest
-    steps:
-    - name: checkout
-      uses: actions/checkout@v4.1.0
-    - uses: actions/setup-go@v4
-      with:
-        go-version: "${{ inputs.GOVERSION }}"
-    - name: Download Bin
-      uses: actions/download-artifact@v4.1.0
-      with:
-        name: build-bin
-        path: bin
-    - name: Docker Login
-      uses: docker/login-action@v3.0.0
-      with:
-        registry: ghcr.io
-        username: ${{ github.actor }}
-        password: ${{ secrets.GITHUB_TOKEN }}
-    - name: Configure Agent
-      run: go run mage.go ConfigureAgent SetBinExecutable
-    - name: Integration Test
-      run: mage -v TestIntegration
+    uses: "./.github/workflows/porter-integration-release.yml"
+    with:
+      registry: ${{inputs.registry}}
   Validate-smoke_test:
     name: Run smoke tests on
     needs:
@@ -140,7 +118,7 @@ jobs:
       run: go run mage.go ConfigureAgent UseXBuildBinaries
     - name: Run Smoke Tests
       run: mage -v TestSmoke
-  Publish-publish_binaries:
+  publish_binaries:
     name: Publish Binaries
     needs:
     - Validate-build
@@ -150,6 +128,7 @@ jobs:
     - Validate-integration_test
     - Validate-smoke_test
     runs-on: ubuntu-latest
+    permissions: write-all
     if: success() && inputs.shouldPublish
     steps:
     - name: checkout
@@ -167,11 +146,13 @@ jobs:
     - name: Publish Porter Binaries
       env:
         GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+        VERSION: ${{github.ref_name}}
       run: mage PublishPorter PublishMixins
-  Publish-publish_docker:
+  publish-ghcr:
     env:
-      DOCKER_REGISTRY:
-      DOCKER_USERNAME:
+      DOCKER_REGISTRY: ${{inputs.registry}}
+      DOCKER_USERNAME: getporterbot
+      VERSION: ${{github.ref_name}}
     name: Publish Docker Images
     needs:
     - Validate-build
@@ -181,6 +162,7 @@ jobs:
     - Validate-integration_test
     - Validate-smoke_test
     runs-on: ubuntu-latest
+    permissions: write-all
     if: success() && inputs.shouldPublish
     steps:
     - name: checkout
@@ -195,12 +177,11 @@ jobs:
         path: bin
     - name: Setup Bin
       run: go run mage.go ConfigureAgent UseXBuildBinaries
-    # Unable to determine registry '${{parameters.registry}}' type. The service connection was not found or the authentication type not supported.
-    - name: Docker Login
+    - name: Login to Container Registry
       uses: docker/login-action@v3.0.0
       with:
-        registry: "${{ env.DOCKER_REGISTRY }}"
-        username: "${{ env.DOCKER_USERNAME }}"
-        password: "${{ secrets.DOCKER_PASSWORD }}"
+        registry: "${{inputs.registry}}"
+        username: "${{ github.actor }}"
+        password: "${{ secrets.GITHUB_TOKEN }}"
     - name: Publish Docker Images to ${{inputs.registry}}
       run: PORTER_REGISTRY=${{inputs.registry}} mage PublishImages
diff --git a/.github/workflows/check-licenses.yaml b/.github/workflows/check-licenses.yaml
@@ -14,7 +14,7 @@ jobs:
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
           cache: true

diff --git a/.github/workflows/close-issues.yaml b/.github/workflows/close-issues.yaml
@@ -10,10 +10,10 @@ on:
       - release/*
 
 jobs:
-  closeIssue:
+  closeIssueOnPrMergeTrigger:
     runs-on: ubuntu-latest
     steps:
       - name: Closes issues related to a merged pull request.
-        uses: ldez/gha-mjolnir@v1.1.0
+        uses: ldez/gha-mjolnir@v1.0.3
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/codeql.yaml b/.github/workflows/codeql.yaml
@@ -21,7 +21,7 @@ jobs:
         with:
           fetch-depth: 0 # Get all git history
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version-file: go.mod
           cache: true

diff --git a/.github/workflows/integ-reuseable-workflow.yml b/.github/workflows/integ-reuseable-workflow.yml
@@ -0,0 +1,45 @@
+name: integ reusable workflow
+
+on:
+  workflow_call:
+    inputs:
+        test_name:
+            type: string
+            required: true
+        registry:
+            type: string
+            required: true
+            default: ghcr.io
+env:
+    GOVERSION: 1.20.7
+    PORTER_INTEG_FILE: ${{inputs.test_name}}.go
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4.1.0
+    - 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/login-action@v3.0.0
+      with:
+        registry: ${{inputs.registry}}
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Configure Agent
+      run: go run mage.go build
+      shell: bash
+    - name: Integration Test
+      run: go run mage.go -v TestIntegration
+      shell: bash
diff --git a/.github/workflows/porter-integration-pr.yml b/.github/workflows/porter-integration-pr.yml
@@ -0,0 +1,123 @@
+name: porter/porter-integration
+on:
+  pull_request:
+    branches:
+    - main
+    paths-ignore:
+    - 'docs/**'
+
+env:
+    GOVERSION: 1.20.7
+
+jobs:
+  archive_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: archive_test
+  build_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: build_test
+  cli_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: cli_test
+  connection_nix_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: connection_nix_test
+  copy_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: copy_test
+  dependenciesv1_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: dependenciesv1_test
+  dependenciesv2_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: dependenciesv2_test
+  driver_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: driver_test
+  install_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: install_test
+  invoke_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: invoke_test
+  lint_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: lint_test
+  migration_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: migration_test
+  outputs_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: outputs_test
+  publish_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: publish_test
+  pull_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: pull_test
+  registry_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: registry_integration_test
+  schema_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: schema_test
+  sensitive_data_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: sensitive_data_test
+  suppress_output_integration_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: suppress_output_test
+  telemetry_test:
+    uses: getporter/porter/.github/workflows/integ-reuseable-workflow.yml@main
+    with:
+      test_name: telemetry_test
+   # Reusable workflows only supports 20 jobs
+  uninstall_test_integ:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout
+      uses: actions/checkout@v4.1.0
+    - 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/login-action@v3.0.0
+      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: uninstall_test.go
+      run: go run mage.go -v TestIntegration 
+      shell: bash