From 74e0f44230f1d1f79c2a2f0c5a98a09f33eb990d Mon Sep 17 00:00:00 2001
From: Moritz Sanft <58110325+msanft@users.noreply.github.com>
Date: Thu, 4 Jul 2024 11:17:55 +0200
Subject: [PATCH] chore: v2.17.0 post-release (#3229)

Signed-off-by: Moritz Sanft <58110325+msanft@users.noreply.github.com>
---
 .github/workflows/e2e-test-release.yml        |  2 +-
 .github/workflows/e2e-test-weekly.yml         | 13 +++--
 .../provider/attestation_data_source_test.go  | 52 +++++++++----------
 version.txt                                   |  2 +-
 4 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml
index 076be724f..778c6c4e9 100644
--- a/.github/workflows/e2e-test-release.yml
+++ b/.github/workflows/e2e-test-release.yml
@@ -403,7 +403,7 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        fromVersion: ["v2.16.4"]
+        fromVersion: ["v2.17.0"]
         attestationVariant: ["gcp-sev-es", "azure-sev-snp", "azure-tdx", "aws-sev-snp"]
     name: Run upgrade tests
     secrets: inherit
diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml
index ff8a02e27..b56a104d0 100644
--- a/.github/workflows/e2e-test-weekly.yml
+++ b/.github/workflows/e2e-test-weekly.yml
@@ -285,12 +285,11 @@ jobs:
             attestationVariant: "gcp-sev-es"
             kubernetes-version: "v1.29"
             clusterCreation: "cli"
-          # TODO(msanft): Enable once stable GCP SEV-SNP images exist.
-          # - test: "verify"
-          #   refStream: "ref/release/stream/stable/?"
-          #   attestationVariant: "gcp-sev-snp"
-          #   kubernetes-version: "v1.29"
-          #   clusterCreation: "cli"
+          - test: "verify"
+            refStream: "ref/release/stream/stable/?"
+            attestationVariant: "gcp-sev-snp"
+            kubernetes-version: "v1.29"
+            clusterCreation: "cli"
           - test: "verify"
             refStream: "ref/release/stream/stable/?"
             attestationVariant: "azure-sev-snp"
@@ -413,7 +412,7 @@ jobs:
       fail-fast: false
       max-parallel: 1
       matrix:
-        fromVersion: ["v2.16.4"]
+        fromVersion: ["v2.17.0"]
         attestationVariant: ["gcp-sev-es", "azure-sev-snp", "azure-tdx", "aws-sev-snp"]
     name: Run upgrade tests
     secrets: inherit
diff --git a/terraform-provider-constellation/internal/provider/attestation_data_source_test.go b/terraform-provider-constellation/internal/provider/attestation_data_source_test.go
index 3740e6b11..407900551 100644
--- a/terraform-provider-constellation/internal/provider/attestation_data_source_test.go
+++ b/terraform-provider-constellation/internal/provider/attestation_data_source_test.go
@@ -110,33 +110,31 @@ func TestAccAttestationSource(t *testing.T) {
 				},
 			},
 		},
-		// TODO(msanft): Enable once v2.17.0 is available
-		// "gcp sev-snp succcess": {
-		// 	ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
-		// 	PreCheck:                 bazelPreCheck,
-		// 	Steps: []resource.TestStep{
-		// 		{
-		// 			Config: testingConfig + `
-		// 			data "constellation_attestation" "test" {
-		// 				csp = "gcp"
-		// 				attestation_variant = "gcp-sev-snp"
-		// 				image = {
-		// 					version = "v2.17.0"
-		// 					reference = "v2.17.0"
-		// 					short_path = "v2.17.0"
-		// 				}
-		// 			}
-		// 			`,
-		// 			Check: resource.ComposeAggregateTestCheckFunc(
-		// 				resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.variant", "gcp-sev-snp"),
-		// 				resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.bootloader_version", "0"), // since this is not supported on GCP, we expect 0
-
-		// 				resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.measurements.1.expected", "745f2fb4235e4647aa0ad5ace781cd929eb68c28870e7dd5d1a1535854325e56"),
-		// 				resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.measurements.1.warn_only", "true"),
-		// 			),
-		// 		},
-		// 	},
-		// },
+		"gcp sev-snp succcess": {
+			ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
+			PreCheck:                 bazelPreCheck,
+			Steps: []resource.TestStep{
+				{
+					Config: testingConfig + `
+					data "constellation_attestation" "test" {
+						csp = "gcp"
+						attestation_variant = "gcp-sev-snp"
+						image = {
+							version = "v2.17.0"
+							reference = "v2.17.0"
+							short_path = "v2.17.0"
+						}
+					}
+					`,
+					Check: resource.ComposeAggregateTestCheckFunc(
+						resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.variant", "gcp-sev-snp"),
+						resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.bootloader_version", "3"),
+						resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.measurements.1.expected", "3695dcc55e3aa34027c27793c85c723c697d708c42d1f73bd6fa4f26608a5b24"),
+						resource.TestCheckResourceAttr("data.constellation_attestation.test", "attestation.measurements.1.warn_only", "true"),
+					),
+				},
+			},
+		},
 		"STACKIT qemu-vtpm success": {
 			ProtoV6ProviderFactories: testAccProtoV6ProviderFactories,
 			PreCheck:                 bazelPreCheck,
diff --git a/version.txt b/version.txt
index 8dbd61013..4844671e4 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v2.17.0-pre
+v2.18.0-pre