From 79c835f97c4bd4d03b697f16dbf61ba93bd2886f Mon Sep 17 00:00:00 2001 From: jartoo Date: Wed, 5 Jun 2024 19:16:08 -0500 Subject: [PATCH 1/5] Update cdnprofile to include the Standard and Premium Frontdoor options --- plugins/modules/azure_rm_cdnprofile.py | 4 +++- requirements.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/plugins/modules/azure_rm_cdnprofile.py b/plugins/modules/azure_rm_cdnprofile.py index ebac6f22f..374c740ae 100644 --- a/plugins/modules/azure_rm_cdnprofile.py +++ b/plugins/modules/azure_rm_cdnprofile.py @@ -42,6 +42,8 @@ - standard_akamai - standard_chinacdn - standard_microsoft + - standard_azurefrontdoor + - premium_azurefrontdoor state: description: - Assert the state of the CDN profile. Use C(present) to create or update a CDN profile and C(absent) to delete it. @@ -129,7 +131,7 @@ def __init__(self): ), sku=dict( type='str', - choices=['standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', 'standard_chinacdn', 'standard_microsoft'] + choices=['standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', 'standard_chinacdn', 'standard_microsoft', 'standard_azurefrontdoor', 'premium_azurefrontdoor'] ) ) diff --git a/requirements.txt b/requirements.txt index 557c59e47..41ce99a2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ azure-identity==1.14.0 azure-mgmt-authorization==2.0.0 azure-mgmt-apimanagement==3.0.0 azure-mgmt-batch==16.2.0 -azure-mgmt-cdn==11.0.0 +azure-mgmt-cdn==13.1.0 azure-mgmt-compute==30.6.0 azure-mgmt-containerinstance==9.0.0 azure-mgmt-core==1.4.0 From 2604cb4874e2e7805e1023496700822f785dff78 Mon Sep 17 00:00:00 2001 From: jartoo Date: Fri, 7 Jun 2024 11:01:03 -0500 Subject: [PATCH 2/5] Updated per Fred's request to split lengthy line of code. --- plugins/modules/azure_rm_cdnprofile.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/modules/azure_rm_cdnprofile.py b/plugins/modules/azure_rm_cdnprofile.py index 374c740ae..7ae14bf0d 100644 --- a/plugins/modules/azure_rm_cdnprofile.py +++ b/plugins/modules/azure_rm_cdnprofile.py @@ -131,7 +131,11 @@ def __init__(self): ), sku=dict( type='str', - choices=['standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', 'standard_chinacdn', 'standard_microsoft', 'standard_azurefrontdoor', 'premium_azurefrontdoor'] + choices=[ + 'standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', + 'standard_chinacdn', 'standard_microsoft', + 'standard_azurefrontdoor', 'premium_azurefrontdoor' + ] ) ) From 525d61cf0644a3d09d314fe895f13b7e591e85d6 Mon Sep 17 00:00:00 2001 From: Jarret Tooley <89205294+jartoo@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:26:09 -0500 Subject: [PATCH 3/5] Update plugins/modules/azure_rm_cdnprofile.py Co-authored-by: Fred-sun <37327967+Fred-sun@users.noreply.github.com> --- plugins/modules/azure_rm_cdnprofile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/azure_rm_cdnprofile.py b/plugins/modules/azure_rm_cdnprofile.py index 7ae14bf0d..f095b0b7d 100644 --- a/plugins/modules/azure_rm_cdnprofile.py +++ b/plugins/modules/azure_rm_cdnprofile.py @@ -132,7 +132,7 @@ def __init__(self): sku=dict( type='str', choices=[ - 'standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', + 'standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', 'standard_chinacdn', 'standard_microsoft', 'standard_azurefrontdoor', 'premium_azurefrontdoor' ] From ed5b9c62e47b52e7eacf38eb1286c09f93c6a4b5 Mon Sep 17 00:00:00 2001 From: Jarret Tooley <89205294+jartoo@users.noreply.github.com> Date: Mon, 17 Jun 2024 10:26:20 -0500 Subject: [PATCH 4/5] Update plugins/modules/azure_rm_cdnprofile.py Co-authored-by: Fred-sun <37327967+Fred-sun@users.noreply.github.com> --- plugins/modules/azure_rm_cdnprofile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/azure_rm_cdnprofile.py b/plugins/modules/azure_rm_cdnprofile.py index f095b0b7d..c269368d1 100644 --- a/plugins/modules/azure_rm_cdnprofile.py +++ b/plugins/modules/azure_rm_cdnprofile.py @@ -133,7 +133,7 @@ def __init__(self): type='str', choices=[ 'standard_verizon', 'premium_verizon', 'custom_verizon', 'standard_akamai', - 'standard_chinacdn', 'standard_microsoft', + 'standard_chinacdn', 'standard_microsoft', 'standard_azurefrontdoor', 'premium_azurefrontdoor' ] ) From c4fa9ac025b841b84555313cbba3effcb4d1696e Mon Sep 17 00:00:00 2001 From: jartoo Date: Mon, 17 Jun 2024 11:55:01 -0500 Subject: [PATCH 5/5] Must use azure.mgmt.cdn==13.1.1 to resolve cache_configuration set to NULL issue --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1f80cb95c..81bd38130 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ azure-identity==1.14.0 azure-mgmt-authorization==2.0.0 azure-mgmt-apimanagement==3.0.0 azure-mgmt-batch==16.2.0 -azure-mgmt-cdn==13.1.0 +azure-mgmt-cdn==13.1.1 azure-mgmt-compute==30.6.0 azure-mgmt-containerinstance==9.0.0 azure-mgmt-core==1.4.0