diff --git a/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl b/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl index ddd541f64..0f7719120 100644 --- a/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl +++ b/quickstart/201-vmss-packer-jumpbox/ubuntu.pkr.hcl @@ -8,21 +8,21 @@ packer { } variable client_id { - type = string + type = string default = null } variable client_secret { - type = string + type = string default = null } variable subscription_id { - type = string + type = string default = null } variable tenant_id { - type = string + type = string default = null } @@ -35,6 +35,14 @@ variable "image_resource_group_name" { default = "myPackerImages" } +variable "oidc_request_url" { + default = null +} + +variable "oidc_request_token" { + default = null +} + # arm builder source "azure-arm" "builder" { client_id = var.client_id @@ -48,8 +56,10 @@ source "azure-arm" "builder" { os_type = "Linux" subscription_id = var.subscription_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" - azure_tags = { + azure_tags = { "dept" : "Engineering", "task" : "Image deployment", } diff --git a/test/e2e/quickstart_test.go b/test/e2e/quickstart_test.go index 5bd81a35f..d004adf5e 100644 --- a/test/e2e/quickstart_test.go +++ b/test/e2e/quickstart_test.go @@ -127,6 +127,12 @@ func test201VmssPackerJumpbox(t *testing.T) { if tenantId := os.Getenv("ARM_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) { output, err := shell.RunCommandAndGetStdOutE(t, command) if err != nil {