From 55b7e426689017439b79e1536d81ff401833d4c5 Mon Sep 17 00:00:00 2001 From: Keith Mattix II Date: Wed, 26 Jan 2022 11:06:30 -0600 Subject: [PATCH 1/5] Fix REST reference for privateca_certificate pem_certificates --- google/resource_privateca_certificate.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/resource_privateca_certificate.go b/google/resource_privateca_certificate.go index 696b17e68e9..a6df6d8136d 100644 --- a/google/resource_privateca_certificate.go +++ b/google/resource_privateca_certificate.go @@ -1090,7 +1090,7 @@ func resourcePrivatecaCertificateRead(d *schema.ResourceData, meta interface{}) if err := d.Set("certificate_description", flattenPrivatecaCertificateCertificateDescription(res["certificateDescription"], d, config)); err != nil { return fmt.Errorf("Error reading Certificate: %s", err) } - if err := d.Set("pem_certificates", flattenPrivatecaCertificatePemCertificates(res["pemCertificates"], d, config)); err != nil { + if err := d.Set("pem_certificates", flattenPrivatecaCertificatePemCertificates(res["pemCertificateChain"], d, config)); err != nil { return fmt.Errorf("Error reading Certificate: %s", err) } if err := d.Set("create_time", flattenPrivatecaCertificateCreateTime(res["createTime"], d, config)); err != nil { From 1026b38a1b2e7f7f88b9fccb6de3ecb2746d4950 Mon Sep 17 00:00:00 2001 From: Keith Mattix II Date: Wed, 26 Jan 2022 12:02:44 -0600 Subject: [PATCH 2/5] Change goreleaser --- .goreleaser.yml | 125 ++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 73 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index 3b60d171bf0..fcfe9906856 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,79 +1,58 @@ -archives: - - files: - # Only include built binary in archive - - 'none*' - format: zip - name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}' +# Visit https://goreleaser.com for documentation on how to customize this +# behavior. +before: + hooks: [] builds: - - # Special binary naming is only necessary for Terraform CLI 0.12 - binary: '{{ .ProjectName }}_v{{ .Version }}_x5' - env: - - CGO_ENABLED=0 - flags: - - -trimpath - goos: - - darwin - - freebsd - - linux - - windows - goarch: - - '386' - - amd64 - - arm - - arm64 - ignore: - - goarch: arm - goos: windows - - goarch: arm64 - goos: freebsd - - goarch: arm64 - goos: windows - ldflags: - - -s -w -X internal/provider.Version={{.Version}} - mod_timestamp: '{{ .CommitTimestamp }}' +- env: + # goreleaser does not work with CGO, it could also complicate + # usage by users in CI/CD systems like Terraform Cloud where + # they are unable to install libraries. + - CGO_ENABLED=0 + mod_timestamp: '{{ .CommitTimestamp }}' + flags: + - -trimpath + ldflags: + - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}' + goos: + - freebsd + - windows + - linux + - darwin + goarch: + - amd64 + - '386' + - arm + - arm64 + ignore: + - goos: darwin + goarch: '386' + binary: '{{ .ProjectName }}_v{{ .Version }}' +archives: +- format: zip + name_template: '{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}' checksum: + extra_files: + - glob: 'terraform-registry-manifest.json' + name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json' name_template: '{{ .ProjectName }}_{{ .Version }}_SHA256SUMS' algorithm: sha256 -publishers: - - name: hc-releases - checksum: true - signature: true - cmd: hc-releases upload-file -header="x-terraform-protocol-version={{ .Env.PROTOCOL_VERSION }}" -header="x-terraform-protocol-versions={{ .Env.PROTOCOL_VERSIONS }}" {{ abs .ArtifactPath }} - env: - - AWS_DEFAULT_REGION={{ .Env.AWS_DEFAULT_REGION }} - - AWS_REGION={{ .Env.AWS_REGION }} - - AWS_ACCESS_KEY_ID={{ .Env.AWS_ACCESS_KEY_ID }} - - AWS_SECRET_ACCESS_KEY={{ .Env.AWS_SECRET_ACCESS_KEY }} - - AWS_SESSION_TOKEN={{ .Env.AWS_SESSION_TOKEN }} -release: - ids: - - none signs: - # Default Signature file (i.e. terraform-provider-awscc_VERSION_SHA256SUMS.sig) - - cmd: sh + - artifacts: checksum args: - - -c - - >- - signore - sign - --dearmor - --file ${artifact} - --signer {{ .Env.SIGNER }} - --out ${signature} - artifacts: checksum - # Signature file with GPG Public Key ID in filename (i.e. terraform-provider-awscc_VERSION_SHA256SUMS.7685B676.sig) - - id: sig-with-gpg-public-key-id - signature: ${artifact}.72D7468F.sig - cmd: sh - args: - - -c - - >- - signore - sign - --dearmor - --file ${artifact} - --signer {{ .Env.SIGNER }} - --out ${signature} - artifacts: checksum -snapshot: - name_template: "{{ .Tag }}-next" + # if you are using this in a GitHub action or some other automated pipeline, you + # need to pass the batch flag to indicate its not interactive. + - "--batch" + - "--local-user" + - "{{ .Env.GPG_FINGERPRINT }}" # set this environment variable for your signing key + - "--output" + - "${signature}" + - "--detach-sign" + - "${artifact}" +release: + extra_files: + - glob: 'terraform-registry-manifest.json' + name_template: '{{ .ProjectName }}_{{ .Version }}_manifest.json' + # If you want to manually examine the release before its live, uncomment this line: + # draft: true +changelog: + skip: true \ No newline at end of file From cfe048d8e13dade10c0c43d1434ee3e62f7bb3c4 Mon Sep 17 00:00:00 2001 From: Keith Mattix II Date: Wed, 26 Jan 2022 12:36:17 -0600 Subject: [PATCH 3/5] Only release linux --- .goreleaser.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index fcfe9906856..773b0be2c6b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -14,8 +14,6 @@ builds: ldflags: - '-s -w -X main.version={{.Version}} -X main.commit={{.Commit}}' goos: - - freebsd - - windows - linux - darwin goarch: From 8d2b3ab686cad5e4b509ed0a104f98ed68d0bd69 Mon Sep 17 00:00:00 2001 From: Keith Mattix II Date: Wed, 26 Jan 2022 13:16:23 -0600 Subject: [PATCH 4/5] Add manifest --- terraform-registry-manifest.json | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 terraform-registry-manifest.json diff --git a/terraform-registry-manifest.json b/terraform-registry-manifest.json new file mode 100644 index 00000000000..acf1daa8b13 --- /dev/null +++ b/terraform-registry-manifest.json @@ -0,0 +1,6 @@ +{ + "version": 1, + "metadata": { + "protocol_versions": ["5.0"] + } +} \ No newline at end of file From cddc5d87e5652ffcf9e38559141209341e20a34a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 May 2023 21:34:28 +0000 Subject: [PATCH 5/5] Bump flask in /google/test-fixtures/appengine/hello-world-flask Bumps [flask](https://github.com/pallets/flask) from 1.1.1 to 2.3.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/1.1.1...2.3.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../test-fixtures/appengine/hello-world-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/test-fixtures/appengine/hello-world-flask/requirements.txt b/google/test-fixtures/appengine/hello-world-flask/requirements.txt index f358d0ad8e4..0edc76882b9 100644 --- a/google/test-fixtures/appengine/hello-world-flask/requirements.txt +++ b/google/test-fixtures/appengine/hello-world-flask/requirements.txt @@ -1,2 +1,2 @@ -Flask==1.1.1 +Flask==2.3.2 gunicorn==20.0.4 \ No newline at end of file