Tips-Of-Mine/terraform-azure
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try to fix 201-vmss-packer-jumpbox

Browse Source
This commit is contained in:
hezijie 2024-09-14 12:23:05 +08:00
parent 39dcf38e31
commit 1b66215af1
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl
View File

@ -8,21 +8,21 @@ packer {
} }
variable client_id { variable client_id {
type = string type = string
default = null default = null
} }
variable client_secret { variable client_secret {
type = string type = string
default = null default = null
} }
variable subscription_id { variable subscription_id {
type = string type = string
default = null default = null
} }
variable tenant_id { variable tenant_id {
type = string type = string
default = null default = null
} }
@ -35,6 +35,14 @@ variable "image_resource_group_name" {
default = "myPackerImages" default = "myPackerImages"
} }
variable "oidc_request_url" {
default = null
}
variable "oidc_request_token" {
default = null
}
# arm builder # arm builder
source "azure-arm" "builder" { source "azure-arm" "builder" {
client_id = var.client_id client_id = var.client_id
@ -48,8 +56,10 @@ source "azure-arm" "builder" {
os_type = "Linux" os_type = "Linux"
subscription_id = var.subscription_id subscription_id = var.subscription_id
tenant_id = var.tenant_id tenant_id = var.tenant_id
oidc_request_url = var.oidc_request_url
oidc_request_token = var.oidc_request_token
vm_size = "Standard_DS2_v2" vm_size = "Standard_DS2_v2"
azure_tags = { azure_tags = {
"dept" : "Engineering", "dept" : "Engineering",
"task" : "Image deployment", "task" : "Image deployment",
} }

6
test/e2e/quickstart_test.go
View File

@ -127,6 +127,12 @@ func test201VmssPackerJumpbox(t *testing.T) {
if tenantId := os.Getenv("ARM_TENANT_ID"); tenantId != "" { if tenantId := os.Getenv("ARM_TENANT_ID"); tenantId != "" {
packerVars["tenant_id"] = tenantId packerVars["tenant_id"] = tenantId
} }
if oidcRequestToken := os.Getenv("ACTIONS_ID_TOKEN_REQUEST_TOKEN"); oidcRequestToken != "" {
packerVars["oidc_request_token"] = oidcRequestToken
}
if oidcRequestUrl := os.Getenv("ACTIONS_ID_TOKEN_REQUEST_URL"); oidcRequestUrl != "" {
packerVars["oidc_request_url"] = oidcRequestUrl
}
patches := gomonkey.ApplyFunc(shell.RunCommandAndGetOutputE, func(t terratest.TestingT, command shell.Command) (string, error) { patches := gomonkey.ApplyFunc(shell.RunCommandAndGetOutputE, func(t terratest.TestingT, command shell.Command) (string, error) {
output, err := shell.RunCommandAndGetStdOutE(t, command) output, err := shell.RunCommandAndGetStdOutE(t, command)
if err != nil { if err != nil {