Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.7.2 #69

Merged
merged 15 commits into from
Mar 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 19 additions & 18 deletions .github/workflows/cd-guest-config.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: cd-guest-config
name: cd-machine-config
on:
push:
branches: [main]
paths:
- "examples-guest-config"
- "examples-machine-config"
workflow_dispatch:

jobs:
cd:
cd-machine-config:
env:
TF_IN_AUTOMATION: true
TF_INPUT: false
Expand All @@ -17,32 +17,33 @@ jobs:
ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }}
ARM_SUBSCRIPTION_ID: ${{ secrets.ARM_SUBSCRIPTION_ID }}
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
runs-on: ubuntu-latest
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: hashicorp/setup-terraform@v2
with:
terraform_version: ~1.1.0
- uses: actions/checkout@v3

- name: Log in with Azure
uses: azure/login@v1
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}
enable-AzPSSession: true
- name: Install Terraform
id: tfinstall
run: choco install terraform

- name: Terraform Init
id: init
run: terraform init
working-directory: examples-guest-config
run: terraform init -no-color
working-directory: examples-machine-config

- name: Terraform Build Machine Configs
id: build
if: ${{ success() }}
run: terraform apply -target null_resource.build_machine_config_packages -parallelism=1
working-directory: examples-machine-config

- name: Terraform Apply
id: apply
if: ${{ success() }}
run: terraform apply && terraform apply -var="build_packages=false"
working-directory: examples-guest-config
run: terraform apply
working-directory: examples-machine-config

- name: Terraform Destroy
id: destroy
if: ${{ success() }}
run: terraform destroy
working-directory: examples-guest-config
working-directory: examples-machine-config
6 changes: 3 additions & 3 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: hashicorp/setup-terraform@v2
with:
terraform_version: ~1.2.6
terraform_version: ~1.3.0

- name: Terraform Init
id: init
Expand All @@ -35,7 +35,7 @@ jobs:
run: terraform apply
working-directory: examples

- name: Log in with Azure
- name: Azure Login
uses: azure/login@v1
if: ${{ failure() }} || ${{ success() }}
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- uses: hashicorp/setup-terraform@v2
with:
terraform_version: ~1.2.6
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ override.tf.json
.terraformrc
terraform.rc

# Custom Guest Configs
scripts/dsc_examples/*/
scripts/definitionList.json

### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
└──📜policy_name.json (e.g. whitelist_regions, should correspond to [var.policy_name])
📦scripts
├──📂dsc_examples
└──📜build_guest_config_packages.ps1 (build and publish azure policy guest configuration packages)
└──📜build_machine_config_packages.ps1 (build and publish custom guest configuration packages)
```

## [Custom Policy Definitions Module](modules/definition)
Expand Down
61 changes: 0 additions & 61 deletions examples-guest-config/README.md

This file was deleted.

13 changes: 0 additions & 13 deletions examples-guest-config/TEMPLATE.md

This file was deleted.

36 changes: 0 additions & 36 deletions examples-guest-config/assignments_team_a.tf

This file was deleted.

26 changes: 0 additions & 26 deletions examples-guest-config/build_packages.tf

This file was deleted.

38 changes: 0 additions & 38 deletions examples-guest-config/data.tf

This file was deleted.

35 changes: 0 additions & 35 deletions examples-guest-config/definitions.tf

This file was deleted.

4 changes: 0 additions & 4 deletions examples-guest-config/outputs.tf

This file was deleted.

15 changes: 0 additions & 15 deletions examples-guest-config/variables.tf

This file was deleted.

Loading