Merge pull request #419 from hashicorp/VCDL-251

VCDL-251 Taxonomy Alignment - HCP Terraform

.github/workflows/deploy-terraform-cloud-gcp-v2.yml → .github/workflows/deploy-hcp-terraform-aws-v2.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-gcp-v2
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-aws-v2
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-gcp-v2/**'
+      - 'instruqt-tracks/hcp-terraform-aws-v2/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-gcp-v2"
+      working_directory: "instruqt-tracks/hcp-terraform-aws-v2"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/deploy-terraform-cloud-gcp.yml → .github/workflows/deploy-hcp-terraform-aws.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-gcp
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-aws
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-gcp/**'
+      - 'instruqt-tracks/hcp-terraform-aws/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-gcp"
+      working_directory: "instruqt-tracks/hcp-terraform-aws"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/deploy-terraform-cloud-aws-v2.yml → .github/workflows/deploy-hcp-terraform-azure-v2.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-aws-v2
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-azure-v2
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-aws-v2/**'
+      - 'instruqt-tracks/hcp-terraform-azure-v2/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-aws-v2"
+      working_directory: "instruqt-tracks/hcp-terraform-azure-v2"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/deploy-terraform-cloud-aws.yml → .github/workflows/deploy-hcp-terraform-azure.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-aws
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-azure
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-aws/**'
+      - 'instruqt-tracks/hcp-terraform-azure/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-aws"
+      working_directory: "instruqt-tracks/hcp-terraform-azure"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/deploy-terraform-cloud-bonus-lab.yml → .github/workflows/deploy-hcp-terraform-bonus-lab.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-bonus-lab
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-bonus-lab
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-bonus-lab/**'
+      - 'instruqt-tracks/hcp-terraform-bonus-lab/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-bonus-lab"
+      working_directory: "instruqt-tracks/hcp-terraform-bonus-lab"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/deploy-terraform-cloud-azure-v2.yml → .github/workflows/deploy-hcp-terraform-gcp-v2.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-azure-v2
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-gcp-v2
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-azure-v2/**'
+      - 'instruqt-tracks/hcp-terraform-gcp-v2/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-azure-v2"
+      working_directory: "instruqt-tracks/hcp-terraform-gcp-v2"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/deploy-terraform-cloud-azure.yml → .github/workflows/deploy-hcp-terraform-gcp.yml

@@ -1,20 +1,20 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
-name: hashicorp/field-workshops-terraform/deploy-terraform-cloud-azure
+name: hashicorp/field-workshops-terraform/deploy-hcp-terraform-gcp
 on:
   workflow_dispatch:
   push:
     branches:
       - 'main'
     paths:
-      - 'instruqt-tracks/terraform-cloud-azure/**'
+      - 'instruqt-tracks/hcp-terraform-gcp/**'
 permissions:
   contents: read
 jobs:
   deploy-track:
     uses: ./.github/workflows/instruqt-track-deploy.yml
     with:
-      working_directory: "instruqt-tracks/terraform-cloud-azure"
+      working_directory: "instruqt-tracks/hcp-terraform-gcp"
       INSTRUQT_CLI_URI: ${{ vars.INSTRUQT_CLI_URI }}
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}

.github/workflows/nightly-test.yml

@@ -30,22 +30,22 @@ jobs:
       working_directory: instruqt-tracks/sentinel-for-terraform-v4
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}
-  terraform-cloud-aws:
+  hcp-terraform-aws:
     uses: ./.github/workflows/instruqt-track-test.yml
     with:
-      working_directory: instruqt-tracks/terraform-cloud-aws
+      working_directory: instruqt-tracks/hcp-terraform-aws
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}
-  terraform-cloud-azure:
+  hcp-terraform-azure:
     uses: ./.github/workflows/instruqt-track-test.yml
     with:
-      working_directory: instruqt-tracks/terraform-cloud-azure
+      working_directory: instruqt-tracks/hcp-terraform-azure
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}
-  terraform-cloud-gcp:
+  hcp-terraform-gcp:
     uses: ./.github/workflows/instruqt-track-test.yml
     with:
-      working_directory: instruqt-tracks/terraform-cloud-gcp
+      working_directory: instruqt-tracks/hcp-terraform-gcp
     secrets:
       INSTRUQT_TOKEN: ${{ secrets.INSTRUQT_TOKEN }}
   terraform-foundations-aws:
@@ -76,9 +76,9 @@ jobs:
     needs:
       - sentinel-cli-basics
       - sentinel-for-terraform-v4
-      - terraform-cloud-aws
-      - terraform-cloud-azure
-      - terraform-cloud-gcp
+      - hcp-terraform-aws
+      - hcp-terraform-azure
+      - hcp-terraform-gcp
       - terraform-foundations-aws
       - terraform-intro-aws
       - terraform-intro-azure

README.md

@@ -33,11 +33,11 @@ When creating slides for a new workshop, you will need to do the following:
       ]
     ```
 
-Whether you create a single-part or multi-part slide show, users will be able to access all of your slides with a URL like https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-oss/index.html, but they can leave off `index.html`.
+Whether you create a single-part or multi-part slide show, users will be able to access all of your slides with a URL like https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-community/index.html, but they can leave off `index.html`.
 
 If you create a multi-part slide show, users will also be able to access each part of your slide show separately at URLs like these:
-* https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-oss/terraform-1.html
-* https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-oss/terraform-2.html
+* https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-community/terraform-1.html
+* https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-community/terraform-2.html
 
 Each workshop should give the full link (or links) to that workshop's slides in one of its first few slides.
 

docs/index.md

@@ -29,7 +29,7 @@ name: terraform-workshops
 ### This repository contains Terraform workshops.
 * They are organized by cloud.
 * Workshops for each cloud are organized by type:
-  1. Terraform OSS
+  1. Terraform Community Edition
   1. Terraform Enterprise
 
 ???
@@ -49,9 +49,9 @@ You can also indent one kind of list under another as done in this slide.  To ma
 name:workshop-slides
 # Viewing Workshop Slides
 #### You can view workshop slides with URLs like these:
-* https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-oss/index.html
-* https://hashicorp.github.io/field-workshops-terraform/slides/azure/terraform-oss/index.html
-* https://hashicorp.github.io/field-workshops-terraform/slides/gcp/terraform-oss/index.html
+* https://hashicorp.github.io/field-workshops-terraform/slides/aws/terraform-community/index.html
+* https://hashicorp.github.io/field-workshops-terraform/slides/azure/terraform-community/index.html
+* https://hashicorp.github.io/field-workshops-terraform/slides/gcp/terraform-community/index.html
 
 ???
 The workshop slides are written in Remark.js.

docs/slides/gcp/terraform-cloud-v2/index.html → docs/slides/aws/hcp-terraform-v2/index.html

@@ -7,7 +7,7 @@
 <html>
 
 <head>
-  <title>Terraform Cloud on GCP</title>
+  <title>HCP Terraform on AWS</title>
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 
   <link rel="icon" href="fav-icon/icon.svg" type="image/svg+xml" sizes="32x32" />
@@ -358,7 +358,7 @@
     // want to ignore. The following slides do not active the
     // lightbox - this is an all-or-nothing approach and can be improved.
     const ignore_ids = [
-      "slide-Intro-to-Terraform-Cloud",
+      "slide-Intro-to-hcp-terraform",
       "slide-terraform-adoption-journey",
       "slide-lab-guidance-01",
       "slide-lab-guidance-02",