Skip to content

Commit cb4d627

Browse files
lonegunmanblonegunmanb
authored
Merge branch 'v4' into v4
2 parents a78e7f8 + 25668fa commit cb4d627

File tree

7 files changed

+108
-61
lines changed

7 files changed

+108
-61
lines changed

‎.github/workflows/acc-test.yaml‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,23 @@ on:
1111
- '**/go.mod'
1212

1313
jobs:
14-
acc-tests:
14+
check:
1515
timeout-minutes: 720
16-
runs-on: [self-hosted, 1ES.Pool=terraform-azurerm-aks]
17-
environment:
18-
name: acctests
16+
runs-on: ubuntu-latest
1917
steps:
20-
- uses: actions/checkout@v3
21-
- name: init
18+
- name: Checking for Fork
19+
shell: pwsh
2220
run: |
23-
docker run --rm -v $(pwd):/src -w /src mcr.microsoft.com/azterraform:latest make generate
24-
- name: e2e test
25-
run: |
26-
sh scripts/ci-e2e.sh
27-
- name: upload test version snapshots
28-
uses: actions/upload-artifact@v3
29-
with:
30-
name: TestRecord-${{ github.event.number }}
31-
retention-days: 60
32-
path: |
33-
examples/**/TestRecord.md.tmp
34-
- name: version-upgrade test
35-
env:
36-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
run: |
38-
sh scripts/ci-version-upgrade.sh
21+
$isFork = "${{ github.event.pull_request.head.repo.fork }}"
22+
if($isFork -eq "true") {
23+
echo "### WARNING: This workflow is disabled for forked repositories. Please follow the [release branch process](https://azure.github.io/Azure-Verified-Modules/contributing/terraform/terraform-contribution-flow/#5-create-a-pull-request-to-the-upstream-repository) if end to end tests are required." >> $env:GITHUB_STEP_SUMMARY
24+
}
25+
26+
run-e2e-tests:
27+
if: github.event.pull_request.head.repo.fork == false
28+
uses: Azure/tfmod-scaffold/.github/workflows/tfvm_e2e.yaml@main
29+
name: end to end
30+
secrets: inherit
31+
permissions:
32+
id-token: write
33+
contents: read

‎.github/workflows/weekly-e2e.yaml‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
**Merged pull requests:**
66

7+
- Use oidc as authentication method [\#592](https://github.com/Azure/terraform-azurerm-aks/pull/592) ([lonegunmanb](https://github.com/lonegunmanb))
8+
- Update README.md [\#589](https://github.com/Azure/terraform-azurerm-aks/pull/589) ([shailwx](https://github.com/shailwx))
79
- Add `cost_analysis_enabled` option [\#583](https://github.com/Azure/terraform-azurerm-aks/pull/583) ([artificial-aidan](https://github.com/artificial-aidan))
810
- Bump github.com/Azure/terraform-module-test-helper from 0.24.0 to 0.25.0 in /test [\#581](https://github.com/Azure/terraform-azurerm-aks/pull/581) ([dependabot[bot]](https://github.com/apps/dependabot))
911
- Bump github.com/gruntwork-io/terratest from 0.46.15 to 0.47.0 in /test [\#579](https://github.com/Azure/terraform-azurerm-aks/pull/579) ([dependabot[bot]](https://github.com/apps/dependabot))

‎GNUmakefile‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
SHELL := /bin/bash
22

3-
-include $(shell curl -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/scripts/install.sh" | bash -s > /dev/null ; echo tfmod-scaffold/GNUmakefile)
4-
5-
init:
6-
@sh "$(CURDIR)/scripts/init.sh"
7-
8-
cleanup:
9-
@sh "$(CURDIR)/scripts/cleanup.sh"
3+
$(shell curl -H 'Cache-Control: no-cache, no-store' -sSL "https://raw.githubusercontent.com/Azure/tfmod-scaffold/refs/heads/main/GNUmakefile" -o tfvmmakefile)
4+
-include tfvmmakefile

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# terraform-azurerm-aks
22

3-
## Deploys a Kubernetes cluster on AKS with monitoring support through Azure Log Analytics
3+
## Deploys a Kubernetes cluster (AKS) on Azure with monitoring support through Azure Log Analytics
44

55
This Terraform module deploys a Kubernetes cluster on Azure using AKS (Azure Kubernetes Service) and adds support for monitoring with Log Analytics.
66

‎examples/uai_and_assign_role_on_subnet/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ variable "location" {
88

99
variable "resource_group_name" {
1010
default = "tfmod-aks"
11-
}
11+
}

‎tfvmmakefile‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
REMOTE_SCRIPT := "https://raw.githubusercontent.com/Azure/tfmod-scaffold/main/scripts"
2+
3+
fmt:
4+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/fmt.sh" | bash
5+
6+
fumpt:
7+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/fumpt.sh" | bash
8+
9+
gosec:
10+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/gosec.sh" | bash
11+
12+
tffmt:
13+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/tffmt.sh" | bash
14+
15+
tffmtcheck:
16+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terraform-fmt.sh" | bash
17+
18+
tfvalidatecheck:
19+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terraform-validate.sh" | bash
20+
21+
terrafmtcheck:
22+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terrafmt-check.sh" | bash
23+
24+
gofmtcheck:
25+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/gofmtcheck.sh" | bash
26+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/fumptcheck.sh" | bash
27+
28+
golint:
29+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-golangci-lint.sh" | bash
30+
31+
tflint:
32+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-tflint.sh" | bash
33+
34+
lint: golint tflint gosec
35+
36+
checkovcheck:
37+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/checkovcheck.sh" | bash
38+
39+
checkovplancheck:
40+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/checkovplancheck.sh" | bash
41+
42+
fmtcheck: gofmtcheck tfvalidatecheck tffmtcheck terrafmtcheck
43+
44+
pr-check: depscheck fmtcheck lint unit-test checkovcheck
45+
46+
unit-test:
47+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-unit-test.sh" | bash
48+
49+
e2e-test:
50+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-e2e-test.sh" | bash
51+
52+
version-upgrade-test:
53+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/version-upgrade-test.sh" | bash
54+
55+
terrafmt:
56+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/terrafmt.sh" | bash
57+
58+
pre-commit: tffmt terrafmt depsensure fmt fumpt generate
59+
60+
depsensure:
61+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/deps-ensure.sh" | bash
62+
63+
depscheck:
64+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/deps-check.sh" | bash
65+
66+
generate:
67+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/generate.sh" | bash
68+
69+
gencheck:
70+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/gencheck.sh" | bash
71+
72+
yor-tag:
73+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/yor-tag.sh" | bash
74+
75+
autofix:
76+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/autofix.sh" | bash
77+
78+
test: fmtcheck
79+
@TEST=$(TEST) curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-gradually-deprecated.sh" | bash
80+
@TEST=$(TEST) curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/run-test.sh" | bash
81+
82+
build-test:
83+
curl -H 'Cache-Control: no-cache, no-store' -sSL "$(REMOTE_SCRIPT)/build-test.sh" | bash
84+
85+
.PHONY: fmt fmtcheck pr-check

0 commit comments

Comments
 (0)