do it actually right this time

abcxyz · Feb 14, 2024 · 4550ac6 · 4550ac6
1 parent 055de7c
commit 4550ac6
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git a/templates/commands/goldentest/new_test_cli_test.go b/templates/commands/goldentest/new_test_cli_test.go
@@ -67,7 +67,7 @@ steps:
       message: 'Hello, {{.name}}!'
 `
 
-	testYaml := `api_version: cli.abcxyz.dev/v1beta4
+	testYaml := `api_version: cli.abcxyz.dev/v1beta5
 kind: GoldenTest
 inputs:
     - name: name
@@ -168,7 +168,7 @@ builtin_vars:
 				"testdata/golden/new-test/test.yaml": testYaml,
 			},
 			expectedContents: map[string]string{
-				"test.yaml": `api_version: cli.abcxyz.dev/v1beta4
+				"test.yaml": `api_version: cli.abcxyz.dev/v1beta5
 kind: GoldenTest
 inputs:
     - name: name
@@ -208,7 +208,7 @@ steps:
 `,
 			},
 			expectedContents: map[string]string{
-				"test.yaml": `api_version: cli.abcxyz.dev/v1beta4
+				"test.yaml": `api_version: cli.abcxyz.dev/v1beta5
 kind: GoldenTest
 `,
 			},
@@ -371,7 +371,7 @@ Enter value: `,
 				},
 			},
 			expectedContents: map[string]string{
-				"test.yaml": `api_version: cli.abcxyz.dev/v1beta4
+				"test.yaml": `api_version: cli.abcxyz.dev/v1beta5
 kind: GoldenTest
 inputs:
     - name: name

diff --git a/templates/common/render/manifest_test.go b/templates/common/render/manifest_test.go
@@ -66,7 +66,7 @@ func TestWriteManifest(t *testing.T) {
 			want: map[string]string{
 				"a.txt": "some other stuff",
 				".abc/manifest_nolocation_2023-12-08T23:59:02.000000013Z.lock.yaml": `# Generated by the "abc templates" command. Do not modify.
-api_version: cli.abcxyz.dev/v1beta4
+api_version: cli.abcxyz.dev/v1beta5
 kind: Manifest
 creation_time: 2023-12-08T23:59:02.000000013Z
 modification_time: 2023-12-08T23:59:02.000000013Z
@@ -111,7 +111,7 @@ output_hashes:
 			want: map[string]string{
 				"a.txt": "some other stuff",
 				".abc/manifest_github.com%2Ffoo%2Fbar_2023-12-08T23:59:02.000000013Z.lock.yaml": `# Generated by the "abc templates" command. Do not modify.
-api_version: cli.abcxyz.dev/v1beta4
+api_version: cli.abcxyz.dev/v1beta5
 kind: Manifest
 creation_time: 2023-12-08T23:59:02.000000013Z
 modification_time: 2023-12-08T23:59:02.000000013Z
@@ -174,7 +174,7 @@ output_hashes:
 			want: map[string]string{
 				"a.txt": "some other stuff",
 				".abc/manifest_nolocation_2023-12-08T23:59:02.000000013Z.lock.yaml": `# Generated by the "abc templates" command. Do not modify.
-api_version: cli.abcxyz.dev/v1beta4
+api_version: cli.abcxyz.dev/v1beta5
 kind: Manifest
 creation_time: 2023-12-08T23:59:02.000000013Z
 modification_time: 2023-12-08T23:59:02.000000013Z
@@ -206,7 +206,7 @@ output_hashes:
 			outputHashes: map[string][]byte{},
 			want: map[string]string{
 				".abc/manifest_nolocation_2023-12-08T23:59:02.000000013Z.lock.yaml": `# Generated by the "abc templates" command. Do not modify.
-api_version: cli.abcxyz.dev/v1beta4
+api_version: cli.abcxyz.dev/v1beta5
 kind: Manifest
 creation_time: 2023-12-08T23:59:02.000000013Z
 modification_time: 2023-12-08T23:59:02.000000013Z

diff --git a/templates/common/render/render_test.go b/templates/common/render/render_test.go
@@ -169,7 +169,7 @@ steps:
 				"dir1/file_in_dir.txt": "file_in_dir contents",
 				"dir2/file2.txt":       "file2 contents",
 				".abc/manifest_nolocation_2023-12-08T23:59:02.000000013Z.lock.yaml": `# Generated by the "abc templates" command. Do not modify.
-api_version: cli.abcxyz.dev/v1beta4
+api_version: cli.abcxyz.dev/v1beta5
 kind: Manifest
 creation_time: 2023-12-08T23:59:02.000000013Z
 modification_time: 2023-12-08T23:59:02.000000013Z

diff --git a/templates/model/decode/decode.go b/templates/model/decode/decode.go
@@ -107,6 +107,9 @@ var apiVersions = []apiVersionDef{
 			KindManifest:   &manifestv1alpha1.Manifest{},
 		},
 	},
+	// Why is v1beta5 the same as v1beta4? It's a simple hack that works around
+	// a bug in abc versions <=0.5.0, for reasons that are very difficult to
+	// understand. See github.com/abcxyz/abc/pull/431 for rationale.
 	{
 		apiVersion: "cli.abcxyz.dev/v1beta5",
 		unreleased: true,

diff --git a/templates/model/decode/decode_test.go b/templates/model/decode/decode_test.go
@@ -555,7 +555,7 @@ func TestLatestSupportedAPIVersion(t *testing.T) {
 		{
 			name:           "not_release_build",
 			isReleaseBuild: false,
-			want:           "cli.abcxyz.dev/v1beta4", // update for creation of a new api_version
+			want:           "cli.abcxyz.dev/v1beta5", // update for creation of a new api_version
 		},
 	}