diff --git a/.github/workflows/go-validate.yml b/.github/workflows/go-validate.yml index c386cceaa..598ca2104 100644 --- a/.github/workflows/go-validate.yml +++ b/.github/workflows/go-validate.yml @@ -28,7 +28,7 @@ jobs: go-version: '1.17' - run: echo "$GITHUB_SHA" - run: git fetch --all - - run: echo $(git merge-base origin/master $GITHUB_SHA) + - run: echo $(git merge-base origin/main $GITHUB_SHA) - run: make ci-lint check-fmt: runs-on: ubuntu-latest diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml index c64eab96f..40829cb24 100644 --- a/.github/workflows/nightly-release.yml +++ b/.github/workflows/nightly-release.yml @@ -17,7 +17,7 @@ on: jobs: # Build a fresh set of artifacts build-artifacts: - uses: hashicorp/packer/.github/workflows/build.yml@master + uses: hashicorp/packer/.github/workflows/build.yml@main github-release: needs: build-artifacts runs-on: ubuntu-latest diff --git a/.github/workflows/scheduled-link-checker.yml b/.github/workflows/scheduled-link-checker.yml index 498936e47..8dfa9d481 100644 --- a/.github/workflows/scheduled-link-checker.yml +++ b/.github/workflows/scheduled-link-checker.yml @@ -8,7 +8,7 @@ jobs: steps: - name: Set deployment URL env run: - echo "DEPLOYMENT_URL=https://packer-git-master.hashicorp.vercel.app" >> $GITHUB_ENV + echo "DEPLOYMENT_URL=https://packer-git-main.hashicorp.vercel.app" >> $GITHUB_ENV - uses: actions/checkout@master - uses: gaurav-nelson/github-action-markdown-link-check@v1 with: diff --git a/.github/workflows/website-docker-publish.yml b/.github/workflows/website-docker-publish.yml index 34f60d9a1..14a676a80 100644 --- a/.github/workflows/website-docker-publish.yml +++ b/.github/workflows/website-docker-publish.yml @@ -10,8 +10,8 @@ on: push: # Sequence of patterns matched against refs/heads branches: - # Push events on master branch - - 'master' + # Push events on main branch + - 'main' jobs: website-docker-publish: diff --git a/.release/ci.hcl b/.release/ci.hcl index 2c99b3cfb..eeeadbe03 100644 --- a/.release/ci.hcl +++ b/.release/ci.hcl @@ -9,7 +9,7 @@ project "packer" { organization = "hashicorp" repository = "packer" release_branches = [ - "master" + "main" ] } } diff --git a/Makefile b/Makefile index 88fe05783..1de8433dc 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,7 @@ lint: install-lint-deps ## Lint Go code ci-lint: install-lint-deps ## On ci only lint newly added Go source files @echo "==> Running linter on newly added Go source files..." - GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/master HEAD) ./... + GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/main HEAD) ./... fmt: ## Format Go code @go fmt ./... diff --git a/scripts/codesign_example.sh b/scripts/codesign_example.sh index 7b1659c1e..aa68169d0 100755 --- a/scripts/codesign_example.sh +++ b/scripts/codesign_example.sh @@ -83,7 +83,7 @@ res="$(curl --show-error --silent --fail --user "${CIRCLE_TOKEN}:" \ --request POST \ --header 'Content-Type: application/json' \ --header 'Accept: application/json' \ - --data "{ \"branch\": \"master\" ,\"parameters\": { \"PRODUCT\": \"${PRODUCT_NAME}\", \"PKG_NAME\": \"${SN_ID}.zip\" } }" \ + --data "{ \"branch\": \"main\" ,\"parameters\": { \"PRODUCT\": \"${PRODUCT_NAME}\", \"PKG_NAME\": \"${SN_ID}.zip\" } }" \ "${CIRCLE_ENDPOINT}/${CIRCLE_PROJECT}/pipeline")" pipeline_id="$(echo "$res" | jq -r '.id')" echo "CircleCI Pipeline $pipeline_id started" diff --git a/website/content/docs/partnerships.mdx b/website/content/docs/partnerships.mdx index 531793b76..d0096c0c4 100644 --- a/website/content/docs/partnerships.mdx +++ b/website/content/docs/partnerships.mdx @@ -76,7 +76,7 @@ In an effort to support our self-serve model we’ve included links to resources - [Writing vendor extension guide](/docs/plugins/creation) - Sample development implemented by a [partner](https://github.com/exoscale/packer-plugin-exoscale) - [Scaffolding plugin repository](https://github.com/hashicorp/packer-plugin-scaffolding) to help bootstrap a new contribution: -- Contributing to Packer [guidelines](https://github.com/hashicorp/packer/blob/master/.github/CONTRIBUTING.md) +- Contributing to Packer [guidelines](https://github.com/hashicorp/packer/blob/main/.github/CONTRIBUTING.md) - [Packer developer community forum](https://discuss.hashicorp.com/c/packer/23) - [Packer's source code](https://github.com/hashicorp/packer) @@ -87,22 +87,27 @@ We encourage vendors to closely follow the above guidance. Adopting the same str Packer requires all code-level integrations to be written in the [Go](https://golang.org/) programming language and contain an [MPL-2.0](https://en.wikipedia.org/wiki/Mozilla_Public_License) open source license. The only knowledge necessary to write a plugin is basic command-line skills and knowledge of the Go programming language. When writing in Go-Language, HashiCorp has found the integration development process to be straightforward and simple when vendors pay close attention and follow the resources and by adopting the same structure and coding patterns helps expedite the review and release cycles. Please remember that all integration major steps should contain acceptance testing and the appropriate documentation. Data Sources + - [Custom Data Sources documentation](/docs/plugins/creation/custom-datasources) - [Example Data Source](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/datasource) Builders + - [Custom Builders documentation](/docs/plugins/creation/custom-builders) - [Example Builder](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/builder/order) Provisioners + - [Custom Provisioners documentation](/docs/plugins/creation/custom-provisioners) - [Example Provisioner](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/provisioner/toppings) Post-Processors + - [Custom Post-Processors documentation](/docs/plugins/creation/custom-post-processors) - [Example Post-Processor](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/post-processor/receipt) Packer-Plugin-SDK + - The [Packer-plugin SDK](https://github.com/hashicorp/packer-plugin-sdk) contains tools to help plugin developers with common needs, like handling SSH connections or basic plugin architecture. #### 4. Review diff --git a/website/content/docs/plugins/creation/index.mdx b/website/content/docs/plugins/creation/index.mdx index 4b48f16fc..d3721447a 100644 --- a/website/content/docs/plugins/creation/index.mdx +++ b/website/content/docs/plugins/creation/index.mdx @@ -262,7 +262,7 @@ The documentation structure needed for Packer.io can be generated manually, by c Once the first `docs.zip` file has been included into a release you will need to open a one time pull-request against [hashicorp/packer](https://github.com/hashicorp/packer) to register the plugin docs. -This is done by adding the block below for the respective plugin to the file [website/data/plugins-manifest.json](https://github.com/hashicorp/packer/blob/master/website/data/plugins-manifest.json). +This is done by adding the block below for the respective plugin to the file [website/data/plugins-manifest.json](https://github.com/hashicorp/packer/blob/main/website/data/plugins-manifest.json). ```json { @@ -286,7 +286,7 @@ the Packer documentation. Follow the next steps to get the Packer website running and preview the documentation changes: -- Get the [Packer source code](https://github.com/hashicorp/packer). Our website code is under the [website folder](https://github.com/hashicorp/packer/tree/master/website). +- Get the [Packer source code](https://github.com/hashicorp/packer). Our website code is under the [website folder](https://github.com/hashicorp/packer/tree/main/website). - Generate the `docs.zip` file. You can find above the steps to do so. - Add the `zipFile` attribute to the plugin entry in `plugins-manifest.json`. The value should be the full path of the `docs.zip` generated. For example: @@ -301,8 +301,8 @@ Follow the next steps to get the Packer website running and preview the document } ``` -- Go to the [website folder](https://github.com/hashicorp/packer/tree/master/website). - In the website README, follow the steps to [run the website with node](https://github.com/hashicorp/packer/tree/master/website#with-node). +- Go to the [website folder](https://github.com/hashicorp/packer/tree/main/website). + In the website README, follow the steps to [run the website with node](https://github.com/hashicorp/packer/tree/main/website#with-node). - Once the website is up and running, the plugin documentation should be available in `http://localhost:3000/docs`. ### Plugin Development Tips and FAQs diff --git a/website/content/partials/provisioners/unmaintained-plugin.mdx b/website/content/partials/provisioners/unmaintained-plugin.mdx index f59f4b398..f7ddebc13 100644 --- a/website/content/partials/provisioners/unmaintained-plugin.mdx +++ b/website/content/partials/provisioners/unmaintained-plugin.mdx @@ -1 +1,5 @@ -~> **This community maintained provisioner is currently unmaintained**; if you are interested in contributing or taking ownership of it, please reach out to us at [packer@hashicorp.com](mailto://packer@hashicorp.com). More details can be found in the [README](https://github.com/hashicorp/packer/blob/master/README.md#unmaintained-plugins). +~> **This community maintained provisioner is currently unmaintained**; if you +are interested in contributing or taking ownership of it, please reach out to us +at [packer@hashicorp.com](mailto://packer@hashicorp.com). More details can be +found in the +[README](https://github.com/hashicorp/packer/blob/main/README.md#unmaintained-plugins). diff --git a/website/pages/docs/[[...page]].jsx b/website/pages/docs/[[...page]].jsx index a4b4e5a39..88cf7bb1f 100644 --- a/website/pages/docs/[[...page]].jsx +++ b/website/pages/docs/[[...page]].jsx @@ -11,7 +11,7 @@ import { getStaticGenerationFunctions } from '@hashicorp/react-docs-page/server' const additionalComponents = { Badge, BadgesHeader, PluginBadge, Checklist } const baseRoute = 'docs' const localContentDir = 'content/docs' -const mainBranch = 'master' +const mainBranch = 'main' const navDataFile = 'data/docs-nav-data.json' const product = { name: productName, slug: productSlug } diff --git a/website/pages/guides/[[...page]].jsx b/website/pages/guides/[[...page]].jsx index 13c3bcedb..e61983ec6 100644 --- a/website/pages/guides/[[...page]].jsx +++ b/website/pages/guides/[[...page]].jsx @@ -7,7 +7,7 @@ import { getStaticGenerationFunctions } from '@hashicorp/react-docs-page/server' const baseRoute = 'guides' const navDataFile = 'data/guides-nav-data.json' const localContentDir = 'content/guides' -const mainBranch = 'master' +const mainBranch = 'main' const product = { name: productName, slug: productSlug } export default function GuidesLayout(props) { diff --git a/website/pages/intro/[[...page]].jsx b/website/pages/intro/[[...page]].jsx index 219342c42..5160cf5e9 100644 --- a/website/pages/intro/[[...page]].jsx +++ b/website/pages/intro/[[...page]].jsx @@ -7,7 +7,7 @@ import { getStaticGenerationFunctions } from '@hashicorp/react-docs-page/server' const baseRoute = 'intro' const navDataFile = 'data/intro-nav-data.json' const localContentDir = 'content/intro' -const mainBranch = 'master' +const mainBranch = 'main' const product = { name: productName, slug: productSlug } export default function IntroLayout(props) { diff --git a/website/pages/plugins/[[...page]].tsx b/website/pages/plugins/[[...page]].tsx index 79cee7c0a..2cb8acb44 100644 --- a/website/pages/plugins/[[...page]].tsx +++ b/website/pages/plugins/[[...page]].tsx @@ -17,7 +17,7 @@ import { const additionalComponents = { Badge, BadgesHeader, PluginBadge, Checklist } const baseRoute = 'plugins' const localContentDir = 'content/plugins' -const mainBranch = 'master' +const mainBranch = 'main' const navDataFile = 'data/plugins-nav-data.json' const product = { name: productName, slug: productSlug } const remotePluginsFile = 'data/plugins-manifest.json'