mirror of
https://github.com/actions/runner-images.git
synced 2025-12-10 11:07:02 +00:00
Replace client_secret to client_cert_path (#5579)
This commit is contained in:
committed by
GitHub
parent
dc7d03e49d
commit
c93738bd53
@@ -110,7 +110,8 @@ The Packer template includes `variables` section containing user variables used
|
|||||||
- `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it.
|
- `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it.
|
||||||
- `client_id` - The application ID of the AAD Service Principal. Requires `client_secret`.
|
- `client_id` - The application ID of the AAD Service Principal. Requires `client_secret`.
|
||||||
- `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty.
|
- `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty.
|
||||||
- `client_secret` - A password/secret registered for the AAD SP.
|
- `client_secret` - The password or secret for your service principal.
|
||||||
|
- `client_cert_path` - The location of a PEM file containing a certificate and private key for service principal.
|
||||||
- `subscription_id` - The subscription to use.
|
- `subscription_id` - The subscription to use.
|
||||||
- `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`.
|
- `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`.
|
||||||
- `resource_group` - Resource group under which the final artifact will be stored.
|
- `resource_group` - Resource group under which the final artifact will be stored.
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"variables": {
|
"variables": {
|
||||||
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
||||||
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
||||||
|
"client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}",
|
||||||
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
||||||
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
||||||
"resource_group": "{{env `ARM_RESOURCE_GROUP`}}",
|
"resource_group": "{{env `ARM_RESOURCE_GROUP`}}",
|
||||||
@@ -34,6 +35,7 @@
|
|||||||
"type": "azure-arm",
|
"type": "azure-arm",
|
||||||
"client_id": "{{user `client_id`}}",
|
"client_id": "{{user `client_id`}}",
|
||||||
"client_secret": "{{user `client_secret`}}",
|
"client_secret": "{{user `client_secret`}}",
|
||||||
|
"client_cert_path": "{{user `client_cert_path`}}",
|
||||||
"subscription_id": "{{user `subscription_id`}}",
|
"subscription_id": "{{user `subscription_id`}}",
|
||||||
"tenant_id": "{{user `tenant_id`}}",
|
"tenant_id": "{{user `tenant_id`}}",
|
||||||
"location": "{{user `location`}}",
|
"location": "{{user `location`}}",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"variables": {
|
"variables": {
|
||||||
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
||||||
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
||||||
|
"client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}",
|
||||||
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
||||||
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
||||||
"resource_group": "{{env `ARM_RESOURCE_GROUP`}}",
|
"resource_group": "{{env `ARM_RESOURCE_GROUP`}}",
|
||||||
@@ -34,6 +35,7 @@
|
|||||||
"type": "azure-arm",
|
"type": "azure-arm",
|
||||||
"client_id": "{{user `client_id`}}",
|
"client_id": "{{user `client_id`}}",
|
||||||
"client_secret": "{{user `client_secret`}}",
|
"client_secret": "{{user `client_secret`}}",
|
||||||
|
"client_cert_path": "{{user `client_cert_path`}}",
|
||||||
"subscription_id": "{{user `subscription_id`}}",
|
"subscription_id": "{{user `subscription_id`}}",
|
||||||
"tenant_id": "{{user `tenant_id`}}",
|
"tenant_id": "{{user `tenant_id`}}",
|
||||||
"location": "{{user `location`}}",
|
"location": "{{user `location`}}",
|
||||||
|
|||||||
@@ -24,6 +24,11 @@ variable "client_secret" {
|
|||||||
sensitive = true
|
sensitive = true
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "client_cert_path" {
|
||||||
|
type = string
|
||||||
|
default = "${env("ARM_CLIENT_CERT_PATH")}"
|
||||||
|
}
|
||||||
|
|
||||||
variable "commit_url" {
|
variable "commit_url" {
|
||||||
type = string
|
type = string
|
||||||
default = ""
|
default = ""
|
||||||
@@ -146,6 +151,7 @@ source "azure-arm" "build_vhd" {
|
|||||||
capture_name_prefix = "${var.capture_name_prefix}"
|
capture_name_prefix = "${var.capture_name_prefix}"
|
||||||
client_id = "${var.client_id}"
|
client_id = "${var.client_id}"
|
||||||
client_secret = "${var.client_secret}"
|
client_secret = "${var.client_secret}"
|
||||||
|
client_cert_path = "${var.client_cert_path}"
|
||||||
image_offer = "0001-com-ubuntu-server-jammy"
|
image_offer = "0001-com-ubuntu-server-jammy"
|
||||||
image_publisher = "canonical"
|
image_publisher = "canonical"
|
||||||
image_sku = "22_04-lts"
|
image_sku = "22_04-lts"
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"variables": {
|
"variables": {
|
||||||
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
||||||
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
||||||
|
"client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}",
|
||||||
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
||||||
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
||||||
"object_id": "{{env `ARM_OBJECT_ID`}}",
|
"object_id": "{{env `ARM_OBJECT_ID`}}",
|
||||||
@@ -37,6 +38,7 @@
|
|||||||
"type": "azure-arm",
|
"type": "azure-arm",
|
||||||
"client_id": "{{user `client_id`}}",
|
"client_id": "{{user `client_id`}}",
|
||||||
"client_secret": "{{user `client_secret`}}",
|
"client_secret": "{{user `client_secret`}}",
|
||||||
|
"client_cert_path": "{{user `client_cert_path`}}",
|
||||||
"subscription_id": "{{user `subscription_id`}}",
|
"subscription_id": "{{user `subscription_id`}}",
|
||||||
"object_id": "{{user `object_id`}}",
|
"object_id": "{{user `object_id`}}",
|
||||||
"tenant_id": "{{user `tenant_id`}}",
|
"tenant_id": "{{user `tenant_id`}}",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"variables": {
|
"variables": {
|
||||||
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
||||||
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
||||||
|
"client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}",
|
||||||
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
||||||
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
||||||
"object_id": "{{env `ARM_OBJECT_ID`}}",
|
"object_id": "{{env `ARM_OBJECT_ID`}}",
|
||||||
@@ -36,6 +37,7 @@
|
|||||||
"type": "azure-arm",
|
"type": "azure-arm",
|
||||||
"client_id": "{{user `client_id`}}",
|
"client_id": "{{user `client_id`}}",
|
||||||
"client_secret": "{{user `client_secret`}}",
|
"client_secret": "{{user `client_secret`}}",
|
||||||
|
"client_cert_path": "{{user `client_cert_path`}}",
|
||||||
"subscription_id": "{{user `subscription_id`}}",
|
"subscription_id": "{{user `subscription_id`}}",
|
||||||
"object_id": "{{user `object_id`}}",
|
"object_id": "{{user `object_id`}}",
|
||||||
"tenant_id": "{{user `tenant_id`}}",
|
"tenant_id": "{{user `tenant_id`}}",
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
"variables": {
|
"variables": {
|
||||||
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
"client_id": "{{env `ARM_CLIENT_ID`}}",
|
||||||
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
"client_secret": "{{env `ARM_CLIENT_SECRET`}}",
|
||||||
|
"client_cert_path": "{{env `ARM_CLIENT_CERT_PATH`}}",
|
||||||
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
"subscription_id": "{{env `ARM_SUBSCRIPTION_ID`}}",
|
||||||
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
"tenant_id": "{{env `ARM_TENANT_ID`}}",
|
||||||
"object_id": "{{env `ARM_OBJECT_ID`}}",
|
"object_id": "{{env `ARM_OBJECT_ID`}}",
|
||||||
@@ -36,6 +37,7 @@
|
|||||||
"type": "azure-arm",
|
"type": "azure-arm",
|
||||||
"client_id": "{{user `client_id`}}",
|
"client_id": "{{user `client_id`}}",
|
||||||
"client_secret": "{{user `client_secret`}}",
|
"client_secret": "{{user `client_secret`}}",
|
||||||
|
"client_cert_path": "{{user `client_cert_path`}}",
|
||||||
"subscription_id": "{{user `subscription_id`}}",
|
"subscription_id": "{{user `subscription_id`}}",
|
||||||
"object_id": "{{user `object_id`}}",
|
"object_id": "{{user `object_id`}}",
|
||||||
"tenant_id": "{{user `tenant_id`}}",
|
"tenant_id": "{{user `tenant_id`}}",
|
||||||
|
|||||||
Reference in New Issue
Block a user