From d341378c6353a9e0f776ca024215ea11be8672df Mon Sep 17 00:00:00 2001
From: Jim Kalafut <jkalafut@hashicorp.com>
Date: Fri, 18 Jun 2021 11:24:54 -0700
Subject: [PATCH] Rename some references from master to main (#11897)

* Rename some references from master to main

* Update changelog-checker
---
 .circleci/config.yml                                          | 4 ++--
 .../config/commands/exit-if-branch-does-not-need-test-ui.yml  | 2 +-
 .circleci/config/workflows/ci.yml                             | 4 ++--
 .github/workflows/changelog-checker.yml                       | 4 ++--
 .github/workflows/stable-website.yaml                         | 2 +-
 scripts/dist.sh                                               | 2 +-
 scripts/update_plugin_modules.sh                              | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index abfe33183f..baa0ff4960 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -571,7 +571,7 @@ jobs:
     - run:
         command: |
           case "$CIRCLE_BRANCH" in
-          master|ui/*|release/*|merge*) ;;
+          main|ui/*|release/*|merge*) ;;
           *) # If the branch being tested doesn't match one of the above patterns,
              # we don't need to run test-ui and can abort the job.
              circleci-agent step halt
@@ -2385,7 +2385,7 @@ workflows:
         filters:
           branches:
             only:
-            - master
+            - main
         context: vault-docs
     - algolia-index:
         filters:
diff --git a/.circleci/config/commands/exit-if-branch-does-not-need-test-ui.yml b/.circleci/config/commands/exit-if-branch-does-not-need-test-ui.yml
index fe278b91d3..c11ba6ecea 100644
--- a/.circleci/config/commands/exit-if-branch-does-not-need-test-ui.yml
+++ b/.circleci/config/commands/exit-if-branch-does-not-need-test-ui.yml
@@ -6,7 +6,7 @@ steps:
       name: Check branch name
       command: |
         case "$CIRCLE_BRANCH" in
-        master|ui/*|release/*|merge*) ;;
+        main|ui/*|release/*|merge*) ;;
         *) # If the branch being tested doesn't match one of the above patterns,
            # we don't need to run test-ui and can abort the job.
            circleci-agent step halt
diff --git a/.circleci/config/workflows/ci.yml b/.circleci/config/workflows/ci.yml
index 148dda8766..f6e27aaaa6 100644
--- a/.circleci/config/workflows/ci.yml
+++ b/.circleci/config/workflows/ci.yml
@@ -10,7 +10,7 @@ jobs:
       requires:
         - install-ui-dependencies
         - build-go-dev
-        # Only master, UI, release and merge branches need to run UI tests.
+        # Only main, UI, release and merge branches need to run UI tests.
         # We don't filter here however because test-ui is configured in github as
         # required so it must run, instead we short-circuit within test-ui.
   - test-ui-browserstack:
@@ -54,7 +54,7 @@ jobs:
       filters:
         branches:
           only:
-            - master
+            - main
   - algolia-index:
       context: vault-docs
       filters:
diff --git a/.github/workflows/changelog-checker.yml b/.github/workflows/changelog-checker.yml
index de971220f6..d04b676287 100644
--- a/.github/workflows/changelog-checker.yml
+++ b/.github/workflows/changelog-checker.yml
@@ -6,9 +6,9 @@ name: Check Changelog
 on:
   pull_request:
     types: [opened, synchronize, labeled, unlabeled]
-    # Runs on PRs to master
+    # Runs on PRs to main
     branches:
-      - master
+      - main
 
 jobs:
   # checks that a changelog entry is present for a PR
diff --git a/.github/workflows/stable-website.yaml b/.github/workflows/stable-website.yaml
index cdcb5e185b..fdd6da27f9 100644
--- a/.github/workflows/stable-website.yaml
+++ b/.github/workflows/stable-website.yaml
@@ -14,7 +14,7 @@ jobs:
       with:
         ref: stable-website
     - run: |
-        git fetch --no-tags --prune origin master
+        git fetch --no-tags --prune origin main
         git config --local user.email "action@github.com"
         git config --local user.name "GitHub Action"
         git cherry-pick ${{ github.sha }}
diff --git a/scripts/dist.sh b/scripts/dist.sh
index 1e1b2f7b70..e9891b059e 100755
--- a/scripts/dist.sh
+++ b/scripts/dist.sh
@@ -28,7 +28,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )/.." && pwd )"
 cd $DIR
 
 if [ -z $RELBRANCH ]; then
-  RELBRANCH=master
+  RELBRANCH=main
 fi
 
 # Tag, unless told not to
diff --git a/scripts/update_plugin_modules.sh b/scripts/update_plugin_modules.sh
index 72dbb999ae..ae87fd8d6a 100755
--- a/scripts/update_plugin_modules.sh
+++ b/scripts/update_plugin_modules.sh
@@ -32,7 +32,7 @@ do
 		cd ..
 	fi
 	cd vault
-	go get github.com/hashicorp/$plugin@master
+	go get github.com/hashicorp/$plugin@main
 	cd ..
 done