Update default branch references (#173)

gruntwork-io · Sep 28, 2022 · 11a6351 · 11a6351
1 parent 2747bfa
commit 11a6351
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,7 +17,7 @@ defaults: &defaults
 install_gruntwork_utils: &install_gruntwork_utils
   name: install gruntwork utils
   command: |
-    curl -Ls https://raw.githubusercontent.com/gruntwork-io/gruntwork-installer/master/bootstrap-gruntwork-installer.sh | bash /dev/stdin --version "${GRUNTWORK_INSTALLER_VERSION}"
+    curl -Ls https://raw.githubusercontent.com/gruntwork-io/gruntwork-installer/main/bootstrap-gruntwork-installer.sh | bash /dev/stdin --version "${GRUNTWORK_INSTALLER_VERSION}"
     gruntwork-install --module-name "gruntwork-module-circleci-helpers" --repo "https://github.com/gruntwork-io/terraform-aws-ci" --tag "${MODULE_CI_VERSION}"
     gruntwork-install --module-name "kubernetes-circleci-helpers" --repo "https://github.com/gruntwork-io/terraform-aws-ci" --tag "${MODULE_CI_VERSION}"
     gruntwork-install --binary-name "terratest_log_parser" --repo "https://github.com/gruntwork-io/terratest" --tag "${TERRATEST_LOG_PARSER_VERSION}"

diff --git a/cmd/main.go b/cmd/main.go
@@ -41,7 +41,7 @@ func main() {
 	app := entrypoint.NewApp()
 	entrypoint.HelpTextLineWidth = 120
 
-	// Override the CLI FlagEnvHinter so it only returns the Usage text of the Flag and doesn't apend the envVar text. Original func https://github.com/urfave/cli/blob/master/flag.go#L652
+	// Override the CLI FlagEnvHinter so it only returns the Usage text of the Flag and doesn't apend the envVar text. Original func https://github.com/urfave/cli/blob/3df9a3c/flag.go#L60
 	cli.FlagEnvHinter = func(envVar, str string) string {
 		return str
 	}

diff --git a/kubectl/secret_test.go b/kubectl/secret_test.go
@@ -180,7 +180,7 @@ func TestListSecretsShowsSecretInNamespace(t *testing.T) {
 	require.Equal(t, len(secrets), 2)
 	found := false
 	for _, secret := range secrets {
-		if secret.Name == fmt.Sprintf("%s-master-password", namespace) {
+		if secret.Name == fmt.Sprintf("%s-root-password", namespace) {
 			found = true
 		}
 	}
@@ -196,7 +196,7 @@ func TestGetSecretGetsSecretByName(t *testing.T) {
 	configData := createSecret(t, ttKubectlOptions, namespace)
 	defer k8s.KubectlDeleteFromString(t, ttKubectlOptions, configData)
 
-	secretName := fmt.Sprintf("%s-master-password", namespace)
+	secretName := fmt.Sprintf("%s-root-password", namespace)
 	secret, err := GetSecret(kubectlOptions, namespace, secretName)
 	require.NoError(t, err)
 	assert.Equal(t, secret.Name, secretName)
@@ -250,7 +250,7 @@ func TestDeleteSecret(t *testing.T) {
 	configData := createSecret(t, ttKubectlOptions, namespace)
 	// We use the E version, because this is expected to error out since the secret is removed.
 	defer k8s.KubectlDeleteFromStringE(t, ttKubectlOptions, configData)
-	secretName := fmt.Sprintf("%s-master-password", namespace)
+	secretName := fmt.Sprintf("%s-root-password", namespace)
 
 	// Make sure the secret was created
 	ttKubectlOptions.Namespace = namespace
@@ -289,6 +289,6 @@ metadata:
 apiVersion: v1
 kind: Secret
 metadata:
-  name: %s-master-password
+  name: %s-root-password
   namespace: %s
 `