diff --git a/.github/workflows/build_azure_pipelinesrelease_template.yml b/.github/workflows/build_azure_pipelinesrelease_template.yml new file mode 100644 index 000000000..515827f45 --- /dev/null +++ b/.github/workflows/build_azure_pipelinesrelease_template.yml @@ -0,0 +1,207 @@ +# Environment variables defined in a calling workflow are not accessible to this reusable workflow. Refer to the documentation for further details on this limitation. +name: build_azure_pipelinesrelease_template +on: + workflow_call: + inputs: + goVersion: + required: false + default: 1.20.7 + type: string + registry: + required: false + default: ghcr.io/getporter/test + type: string + shouldPublish: + required: false + default: false + type: boolean + skipTests: + required: false + default: false + type: boolean +jobs: + Validate-build: + name: Native Compile + runs-on: "{{ vars.}}" + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Configure Agent + run: go run mage.go ConfigureAgent + - name: Native Build + run: mage build + shell: bash + - name: Publish Native Binaries + uses: actions/upload-artifact@v4.0.0 + with: + name: build-bin + path: "${{ github.workspace }}/bin" + Validate-xbuild: + name: Cross Compile + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Configure Agent + run: go run mage.go ConfigureAgent + - name: Cross Compile + run: mage XBuildAll + shell: bash + - name: Publish Release Binaries + uses: actions/upload-artifact@v4.0.0 + with: + name: xbuild-bin + path: "${{ github.workspace }}/bin" + Validate-VetLint: + name: Vet and Lint + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Configure Agent + run: go run mage.go ConfigureAgent + - name: Vet + run: mage Vet + shell: bash + - name: Lint + run: mage Lint + shell: bash + Validate-unit_test: + name: Unit Test + runs-on: ubuntu-latest + if: !(inputs.skipTests) + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Configure Agent + run: go run mage.go ConfigureAgent + - name: Unit Test + 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: "${{ env.GHCR_IOGETPORTER_DOCKER_REGISTRY }}" + username: "${{ env.GHCR_IOGETPORTER_DOCKER_USERNAME }}" + password: "${{ secrets.GHCR_IOGETPORTER_DOCKER_PASSWORD }}" + - name: Configure Agent + run: go run mage.go ConfigureAgent SetBinExecutable + - name: Integration Test + run: mage -v TestIntegration + Validate-smoke_test: + name: Run smoke tests on + needs: + - Validate-xbuild + runs-on: + - self-hosted + if: success() && !(inputs.skipTests) + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Download Cross-Compiled Porter Binaries + uses: actions/download-artifact@v4.1.0 + with: + name: xbuild-bin + path: bin + - name: Setup Bin + run: go run mage.go ConfigureAgent UseXBuildBinaries + - name: Run Smoke Tests + run: mage -v TestSmoke + Publish-publish_binaries: + name: Publish Binaries + needs: + - Validate-build + - Validate-xbuild + - Validate-VetLint + - Validate-unit_test + - Validate-integration_test + - Validate-smoke_test + runs-on: ubuntu-latest + if: success() && inputs.shouldPublish + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Download Cross-Compiled Porter Binaries + uses: actions/download-artifact@v4.1.0 + with: + name: xbuild-bin + path: bin + - name: Setup Bin + run: go run mage.go ConfigureAgent UseXBuildBinaries + - name: Publish Porter Binaries + env: + GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + run: mage PublishPorter PublishMixins + Publish-publish_docker: + env: + DOCKER_REGISTRY: + DOCKER_USERNAME: + name: Publish Docker Images + needs: + - Validate-build + - Validate-xbuild + - Validate-VetLint + - Validate-unit_test + - Validate-integration_test + - Validate-smoke_test + runs-on: ubuntu-latest + if: success() && inputs.shouldPublish + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ inputs.GOVERSION }}" + - name: Download Cross-Compiled Porter Binaries + uses: actions/download-artifact@v4.1.0 + with: + name: xbuild-bin + 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 + uses: docker/login-action@v3.0.0 + with: + registry: "${{ env.DOCKER_REGISTRY }}" + username: "${{ env.DOCKER_USERNAME }}" + password: "${{ secrets.DOCKER_PASSWORD }}" + - name: Publish Docker Images to ${{inputs.registry}} + run: PORTER_REGISTRY=${{inputs.registry}} mage PublishImages diff --git a/.github/workflows/porter-canary.yml b/.github/workflows/porter-canary.yml new file mode 100644 index 000000000..b89303b79 --- /dev/null +++ b/.github/workflows/porter-canary.yml @@ -0,0 +1,27 @@ +name: porter/porter-canary +on: + workflow_dispatch: + inputs: + shouldPublish: + default: true + type: boolean + required: false + skipTests: + default: false + type: boolean + required: false + push: + branches: + - main + - release/* + pull_request: + branches: + - split-builds +jobs: + build_azure_pipelinesrelease_template: + name: build_azure_pipelinesrelease_template + uses: "./.github/workflows/build_azure_pipelinesrelease_template.yml" + with: + registry: ghcr.io/getporter + shouldPublish: "${{inputs.shouldPublish}}" + skipTests: "${{inputs.skipTests}}" diff --git a/.github/workflows/porter-install-check.yml b/.github/workflows/porter-install-check.yml new file mode 100644 index 000000000..1c0656cd5 --- /dev/null +++ b/.github/workflows/porter-install-check.yml @@ -0,0 +1,35 @@ +name: porter/porter-install-check +on: + push: + branches: + - main + pull_request: + branches: + - main +jobs: + linux: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Test Install Script + run: scripts/test/test-linux-install.sh + shell: bash + windows: + runs-on: windows-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Test Install Script + run: scripts\test\test-windows-install.ps1 + shell: powershell + macos: + runs-on: + - self-hosted + - macOS-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - name: Test Install Script + run: scripts/test/test-mac-install.sh + shell: bash diff --git a/.github/workflows/porter-integration.yml b/.github/workflows/porter-integration.yml new file mode 100644 index 000000000..df4e0f5b7 --- /dev/null +++ b/.github/workflows/porter-integration.yml @@ -0,0 +1,38 @@ +name: porter/porter-integration +# this will only run when this is on main branch apparently so use pr for now (temporary) +#on: +# issue_comment: +# types: [created, edited] +on: + pull_request: + branches: + - main + paths-ignore: + - 'docs/**' + +env: + GOVERSION: 1.20.7 + +jobs: + Integration_test: +# if: contains(github.event.comment.body, '/integration_test') + name: Integration Test + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4.1.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" + - name: Docker Login + uses: docker/login-action@v3.0.0 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + - name: Native Build + 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-release.yml b/.github/workflows/porter-release.yml new file mode 100644 index 000000000..e188f284b --- /dev/null +++ b/.github/workflows/porter-release.yml @@ -0,0 +1,15 @@ +name: porter/porter-release +on: + push: + tags: + - v* + - "!latest*" + - "!canary*" +jobs: + build_azure_pipelinesrelease_template: + name: build_azure_pipelinesrelease_template + uses: "./.github/workflows/build_azure_pipelinesrelease_template.yml" + with: + registry: ghcr.io/getporter + shouldPublish: true + skipTests: true diff --git a/.github/workflows/porter.yml b/.github/workflows/porter.yml new file mode 100644 index 000000000..348c73d3f --- /dev/null +++ b/.github/workflows/porter.yml @@ -0,0 +1,124 @@ +name: porter/porter +on: + pull_request: + branches: + - main + paths-ignore: + - 'docs/**' +env: + GOVERSION: 1.20.7 + +jobs: + Build: + name: Native Compile + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3.5.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + - run: go version + - name: Native Build + run: go run mage.go build + shell: bash + - name: Publish Native Binaries + uses: actions/upload-artifact@v3.1.1 + with: + name: build-bin + path: "${{ github.workspace }}/bin" + + XBuild: + name: Cross Compile + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3.5.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + - run: go version + - name: Cross Compile + run: go run mage.go -v XBuildAll + shell: bash + - name: Publish Release Binaries + uses: actions/upload-artifact@v3.1.1 + with: + name: xbuild-bin + path: "${{ github.workspace }}/bin" + + Unit_test: + name: Unit Test + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3.5.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + - run: go version + - name: Unit Test + run: go run mage.go -v TestUnit + shell: bash + + VetLint: + name: Vet and Lint + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3.5.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + - run: go version + - name: Vet + run: go run mage.go Vet + shell: bash + - name: Lint + run: go run mage.go Lint + shell: bash + + Build-docker-images: + name: Build Docker Images + needs: + - XBuild + runs-on: ubuntu-latest + if: success() + steps: + - name: checkout + uses: actions/checkout@v3.5.0 + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + - run: go version + - name: Download Cross-Compiled Porter Binaries + uses: actions/download-artifact@v3.0.1 + with: + name: xbuild-bin + path: bin + - name: Setup Bin + run: go run mage.go UseXBuildBinaries + - name: Build Docker Images + run: go run mage.go BuildImages + + Smoke-test: + name: Smoke Test + needs: + - XBuild + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3.5.0 + - name: Download Cross-Compiled Porter Binaries + uses: actions/download-artifact@v3.0.1 + with: + name: xbuild-bin + path: bin + - uses: actions/setup-go@v4 + with: + go-version: "${{ env.GOVERSION }}" # The Go version to download (if necessary) and use. + - run: go version + - name: Setup Bin + run: go run mage.go UseXBuildBinaries + - name: Run Smoke Tests + run: go run mage.go -v TestSmoke diff --git a/.github/workflows/test-porter-release.yml b/.github/workflows/test-porter-release.yml new file mode 100644 index 000000000..403aa2ff2 --- /dev/null +++ b/.github/workflows/test-porter-release.yml @@ -0,0 +1,26 @@ +name: porter/test-porter-release +on: + workflow_dispatch: + inputs: + shouldPublish: + default: true + type: boolean + required: false + skipTests: + default: true + type: boolean + required: false + pull_request: + branches: + - main +env: + PORTER_PACKAGES_REMOTE: https://github.com/carolynvs/porter-packages.git + PORTER_RELEASE_REPOSITORY: github.com/carolynvs/porter +jobs: + build_azure_pipelinesrelease_template: + name: build_azure_pipelinesrelease_template + uses: "./.github/workflows/build_azure_pipelinesrelease_template.yml" + with: + registry: ghcr.io/getporter/test + shouldPublish: "${{ inputs.shouldPublish }}" + skipTests: "${{ inputs.skipTests }}" diff --git a/.github/workflows/testporterbot.porter-release.yml b/.github/workflows/testporterbot.porter-release.yml new file mode 100644 index 000000000..d4acb0e7e --- /dev/null +++ b/.github/workflows/testporterbot.porter-release.yml @@ -0,0 +1,23 @@ +name: porter/testporterbot.porter-release +on: + workflow_dispatch: + inputs: + shouldPublish: + default: true + type: boolean + required: false + skipTests: + default: true + type: boolean + required: false + pull_request: + branches: + - release/v1 +jobs: + build_azure_pipelinesrelease_template: + name: build_azure_pipelinesrelease_template + uses: "./.github/workflows/build_azure_pipelinesrelease_template.yml" + with: + registry: ghcr.io/getporter/test + shouldPublish: "${{ inputs.shouldPublish }}" + skipTests: "${{ inputs.skipTests }}" diff --git a/docs/i18n/en.yaml b/docs/i18n/en.yaml index 9aa9eb581..f77968d0f 100644 --- a/docs/i18n/en.yaml +++ b/docs/i18n/en.yaml @@ -1,7 +1,7 @@ -copyright: "© The Porter Authors 2023 +copyright: "© The Porter Authors 2024 -© 2023 The Linux Foundation. All rights reserved. +© 2024 The Linux Foundation. All rights reserved. The Linux Foundation has registered trademarks and uses trademarks. For a list of trademarks of The Linux Foundation, please see the [Trademark Usage page](https://www.linuxfoundation.org/legal/trademark-usage)." \ No newline at end of file diff --git a/go.mod b/go.mod index 9064a1d89..413157b78 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/cnabio/cnab-go v0.25.1 github.com/cnabio/cnab-to-oci v0.4.0 github.com/cnabio/image-relocation v0.9.0 - github.com/containerd/containerd v1.7.3 + github.com/containerd/containerd v1.7.11 github.com/davecgh/go-spew v1.1.1 github.com/docker/buildx v0.11.2 github.com/docker/cli v24.0.5+incompatible @@ -62,7 +62,7 @@ require ( github.com/tidwall/sjson v1.2.5 github.com/xeipuuv/gojsonschema v1.2.0 go.mongodb.org/mongo-driver v1.12.0 - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 go.opentelemetry.io/otel v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 @@ -81,12 +81,11 @@ require ( ) require ( - github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect - github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect + github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Microsoft/go-winio v0.6.1 // indirect - github.com/Microsoft/hcsshim v0.10.0 // indirect + github.com/Microsoft/hcsshim v0.11.4 // indirect github.com/PaesslerAG/gval v1.2.2 // indirect github.com/PuerkitoBio/goquery v1.8.1 // indirect github.com/Shopify/logrus-bugsnag v0.0.0-20230117174420-439a4b8ba167 // indirect @@ -109,12 +108,12 @@ require ( github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/containerd/console v1.0.3 // indirect - github.com/containerd/continuity v0.4.1 // indirect + github.com/containerd/continuity v0.4.2 // indirect + github.com/containerd/log v0.1.0 // indirect github.com/containerd/stargz-snapshotter/estargz v0.14.3 // indirect github.com/containerd/typeurl/v2 v2.1.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect github.com/cyberphone/json-canonicalization v0.0.0-20230701045847-91eb5f1b7744 // indirect - github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect github.com/docker/go-connections v0.4.0 // indirect @@ -222,18 +221,18 @@ require ( github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e // indirect 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.44.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect go.opentelemetry.io/otel/metric v1.19.0 // indirect go.opentelemetry.io/proto/otlp v1.0.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.14.0 // indirect + golang.org/x/crypto v0.17.0 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.12.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/sys v0.15.0 // indirect + golang.org/x/term v0.15.0 // indirect + golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.3.0 // indirect golang.org/x/tools v0.11.1 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect diff --git a/go.sum b/go.sum index f6b94d9eb..34ff60a8c 100644 --- a/go.sum +++ b/go.sum @@ -43,10 +43,9 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= get.porter.sh/magefiles v0.6.1-0.20230822194230-77c3a69ead68 h1:DP6jiRuZC6iLFvriQdQBAnV8Iav/vb64Q123dkIEunw= get.porter.sh/magefiles v0.6.1-0.20230822194230-77c3a69ead68/go.mod h1:YsSlQWtGoXCGC4pdD7NxPpvh/FryM1bM0wzMWlJC+Bg= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 h1:59MxjQVfjXsBpLy+dbd2/ELV5ofnUkUZBvWSC85sheA= -github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0/go.mod h1:OahwfttHWG6eJ0clwcfBAHoDI6X/LV/15hx/wlMZSrU= github.com/AlecAivazis/survey/v2 v2.0.5/go.mod h1:WYBhg6f0y/fNYUuesWQc0PKbJcEliGcYHB9sNT3Bg74= github.com/Azure/azure-sdk-for-go v19.1.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 h1:L/gRVlceqvL25UVaW/CKtUDjefjrs0SPonmDGUVOYP0= @@ -64,8 +63,8 @@ github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYr github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Microsoft/hcsshim v0.10.0 h1:PbvoxdUGgXxyirmN5Oncp3POLkxEG5LbWCEBfWmHTGA= -github.com/Microsoft/hcsshim v0.10.0/go.mod h1:3j1trOamcUdi86J5Tr5+1BpqMjSv/QeRWkX2whBF6dY= +github.com/Microsoft/hcsshim v0.11.4 h1:68vKo2VN8DE9AdN4tnkWnmdhqdbpUFM8OF3Airm7fz8= +github.com/Microsoft/hcsshim v0.11.4/go.mod h1:smjE4dvqPX9Zldna+t5FG3rnoHhaB7QYxPRqGcpAD9w= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8 h1:xzYJEypr/85nBpB11F9br+3HUrpgb+fcm5iADzXXYEw= github.com/Netflix/go-expect v0.0.0-20180615182759-c93bf25de8e8/go.mod h1:oX5x61PbNXchhh0oikYAH+4Pcfw5LKv21+Jnpr6r6Pc= github.com/PaesslerAG/gval v1.0.0/go.mod h1:y/nm5yEyTeX6av0OfKJNp9rBNj2XrGhAf5+v24IBN1I= @@ -184,14 +183,15 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= -github.com/containerd/cgroups/v3 v3.0.2 h1:f5WFqIVSgo5IZmtTT3qVBo6TzI1ON6sycSBKkymb9L0= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.3 h1:cKwYKkP1eTj54bP3wCdXXBymmKRQMrWjkLSWZZJDa8o= -github.com/containerd/containerd v1.7.3/go.mod h1:32FOM4/O0RkNg7AjQj3hDzN9cUGtu+HMvaKUNiqCZB8= -github.com/containerd/continuity v0.4.1 h1:wQnVrjIyQ8vhU2sgOiL5T07jo+ouqc2bnKsv5/EqGhU= -github.com/containerd/continuity v0.4.1/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= +github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= +github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= +github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= +github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I= +github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo= github.com/containerd/nydus-snapshotter v0.8.2 h1:7SOrMU2YmLzfbsr5J7liMZJlNi5WT6vtIOxLGv+iz7E= github.com/containerd/stargz-snapshotter/estargz v0.14.3 h1:OqlDCK3ZVUO6C3B/5FSkDwbkEETK84kQgEeFwDC+62k= github.com/containerd/stargz-snapshotter/estargz v0.14.3/go.mod h1:KY//uOCIkSuNAHhJogcZtrNHdKrA99/FCCRjE3HD36o= @@ -216,8 +216,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY= github.com/cyberphone/json-canonicalization v0.0.0-20230701045847-91eb5f1b7744 h1:MqMnhqqfDsYF2bjxndKIqvISTIRBb1KCzrIwVzKJHe0= github.com/cyberphone/json-canonicalization v0.0.0-20230701045847-91eb5f1b7744/go.mod h1:uzvlm1mxhHkdfqitSA92i7Se+S9ksOn3a3qmv/kyOCw= -github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= -github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -946,12 +944,12 @@ go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 h1:ZOLJc06r4CB42laIXg/7udr0pbZyuAihN10A/XuiQRY= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0/go.mod h1:5z+/ZWJQKXa9YT34fQNx5K8Hd1EoIhvtUygUQPqEOgQ= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 h1:RsQi0qJ2imFfCvZabqzM9cNXBG8k6gXMv1A0cXRmH6A= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0/go.mod h1:vsh3ySueQCiKPxFLvjWC4Z135gIa34TQ/NSqkDTZYUM= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.44.0 h1:ewRgsETI7b5nPCK3FqKdY9mFR/9ZwtexwC26//Srjn0= go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.44.0/go.mod h1:+BrAX3hlRmkYIKl2e/eSRaKLkClDTY19gzegkQ+KeEQ= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 h1:KfYpVmrjI7JuToy5k8XV3nkapjWx48k4E4JOtVstzQI= -go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0/go.mod h1:SeQhzAEccGVZVEy7aH87Nh0km+utSpo1pTv6eMMop48= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 h1:x8Z78aZx8cOF0+Kkazoc7lwUNMGy0LrzEMxTm4BbTxg= +go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0/go.mod h1:62CPTSry9QZtOaSsE3tOzhx6LzDhHnXJ6xHeMNNiM6Q= go.opentelemetry.io/otel v1.19.0 h1:MuS/TNf4/j4IXsZuJegVzI1cwut7Qc00344rgH7p8bs= go.opentelemetry.io/otel v1.19.0/go.mod h1:i0QyjOq3UPoTzff0PJB2N66fb4S0+rSbSB15/oyH9fY= go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 h1:Mne5On7VWdx7omSrSSZvM4Kw7cS7NQkOOmLcgscI51U= @@ -1005,8 +1003,8 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= +golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1191,15 +1189,15 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= +golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4= +golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1211,8 +1209,8 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= diff --git a/pkg/porter/lifecycle.go b/pkg/porter/lifecycle.go index 3f3c21bce..c75d48599 100644 --- a/pkg/porter/lifecycle.go +++ b/pkg/porter/lifecycle.go @@ -302,7 +302,6 @@ func (p *Porter) BuildActionArgs(ctx context.Context, installation storage.Insta AllowDockerHostAccess: opts.AllowDockerHostAccess, PersistLogs: !opts.NoLogs, } - return args, nil }