packagespec upgrade -version 0.2.4 (release/1.4.x) (#11465)

* packagespec upgrade -version 0.2.4 * update circleci-multi-file-config * make ci-config * Update tests to reflect new HC public pgp keys. (#11446) Co-authored-by: Nick Cabatoff <[email protected]>
hashicorp · Apr 26, 2021 · c2d7214 · c2d7214
1 parent 0c094a7
commit c2d7214
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 84 deletions.
diff --git a/.circleci/Makefile b/.circleci/Makefile
@@ -10,6 +10,14 @@ CONFIG ?= ci-config
 VERIFY ?= ci-verify
 
 CIRCLECI := circleci --skip-update-check
+ifeq ($(DEBUG_CIRCLECI_CLI),YES)
+CIRCLECI += --debug
+endif
+
+# For config processing, always refer to circleci.com not self-hosted circleci,
+# because self-hosted does not currently support the necessary API.
+CIRCLECI_CLI_HOST := https://circleci.com
+export CIRCLECI_CLI_HOST
 
 # Set up some documentation/help message variables.
 # We do not attempt to install the CircleCI CLI from this Makefile.
@@ -70,6 +78,8 @@ define GEN_CONFIG
 	@mv -f $@.tmp $@
 endef
 
+# Always re-generate the config, as we can't trust timestamps with git.
+.PHONY: $(OUT)
 $(OUT): $(CONFIG_SOURCE) 
 	$(GEN_CONFIG)
 	@echo "$@ updated"

diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.circleci/config/@build-release.yml b/.circleci/config/@build-release.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -268,7 +268,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -341,7 +341,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -414,7 +414,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -487,7 +487,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -560,7 +560,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -633,7 +633,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -706,7 +706,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -779,7 +779,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -852,7 +852,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -925,7 +925,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -998,7 +998,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1071,7 +1071,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1144,7 +1144,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1217,7 +1217,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1290,7 +1290,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:
@@ -1363,7 +1363,7 @@ jobs:
           docker_layer_caching: false
       - add_ssh_keys:
           fingerprints:
-            - c6:96:98:82:dc:04:6c:39:dd:ac:83:05:e3:15:1c:98
+            - 0e:03:77:f4:e2:c3:56:c2:53:6a:03:e1:31:91:2f:06
       - checkout:
           path: .
       - run:

diff --git a/command/operator_generate_root_test.go b/command/operator_generate_root_test.go
@@ -231,7 +231,7 @@ func TestOperatorGenerateRootCommand_Run(t *testing.T) {
 		t.Parallel()
 
 		pgpKey := "keybase:hashicorp"
-		pgpFingerprint := "91a6e7f85d05c65630bef18951852d87348ffc4c"
+		pgpFingerprint := "c874011f0ab405110d02105534365d9472d7468f"
 
 		client, closer := testVaultServer(t)
 		defer closer()

diff --git a/command/operator_rekey_test.go b/command/operator_rekey_test.go
@@ -218,7 +218,7 @@ func TestOperatorRekeyCommand_Run(t *testing.T) {
 		t.Parallel()
 
 		pgpKey := "keybase:hashicorp"
-		pgpFingerprints := []string{"91a6e7f85d05c65630bef18951852d87348ffc4c"}
+		pgpFingerprints := []string{"c874011f0ab405110d02105534365d9472d7468f"}
 
 		client, closer := testVaultServer(t)
 		defer closer()
@@ -396,7 +396,7 @@ func TestOperatorRekeyCommand_Run(t *testing.T) {
 		t.Parallel()
 
 		pgpKey := "keybase:hashicorp"
-		// pgpFingerprints := []string{"91a6e7f85d05c65630bef18951852d87348ffc4c"}
+		// pgpFingerprints := []string{"c874011f0ab405110d02105534365d9472d7468f"}
 
 		client, keys, closer := testVaultServerUnseal(t)
 		defer closer()

diff --git a/helper/pgpkeys/flag_test.go b/helper/pgpkeys/flag_test.go
@@ -149,7 +149,7 @@ func TestPubKeyFilesFlagSetKeybase(t *testing.T) {
 	exp := []string{
 		"0f801f518ec853daff611e836528efcac6caa3db",
 		"cf3d4694c9f57b28cb4092c2eb832c67eb5e8957",
-		"91a6e7f85d05c65630bef18951852d87348ffc4c",
+		"c874011f0ab405110d02105534365d9472d7468f",
 	}
 
 	if !reflect.DeepEqual(fingerprints, exp) {

diff --git a/helper/pgpkeys/keybase_test.go b/helper/pgpkeys/keybase_test.go
@@ -33,7 +33,7 @@ func TestFetchKeybasePubkeys(t *testing.T) {
 
 	exp := []string{
 		"0f801f518ec853daff611e836528efcac6caa3db",
-		"91a6e7f85d05c65630bef18951852d87348ffc4c",
+		"c874011f0ab405110d02105534365d9472d7468f",
 	}
 
 	if !reflect.DeepEqual(fingerprints, exp) {