From 7793939ef277d09516c1a2b8d293f5cdc4cdf944 Mon Sep 17 00:00:00 2001
From: earthmant <trammell@cloudify.co>
Date: Wed, 26 May 2021 16:12:24 +0300
Subject: [PATCH] RD 2472 __NODOCS__

---
 CHANGELOG.txt                                       | 1 +
 cloudify_azure/resources/compute/managed_cluster.py | 5 +++++
 plugin.yaml                                         | 8 ++++++--
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f4f4fc36..3a3f640d 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,4 @@
+3.3.1: RD-2472 - cluster_name property maintained for forward compatibility.
 3.3.0: Add create_if_missing for all azure resources.
 3.2.1: Fix bug, fail if trying to use external resource that doesn't exist.
 3.2.0: Add pull operation for Azure ARM deployment.
diff --git a/cloudify_azure/resources/compute/managed_cluster.py b/cloudify_azure/resources/compute/managed_cluster.py
index fa2d5ea9..58a42fe8 100644
--- a/cloudify_azure/resources/compute/managed_cluster.py
+++ b/cloudify_azure/resources/compute/managed_cluster.py
@@ -37,6 +37,11 @@ def get_manged_cluster_interface(ctx):
 @decorators.with_azure_resource(ManagedCluster)
 def create(ctx, resource_group, cluster_name, resource_config, **_):
     managed_cluster = get_manged_cluster_interface(ctx)
+    if ctx.node.properties.get('cluster_name'):
+        ctx.logger.warn(
+            'The cluster_name is deprecated, but was provided. '
+            'Update your blueprint to use the "name" property, '
+            'which replaces "cluster_name".')
     resource_config_payload = {}
     resource_config_payload = \
         utils.handle_resource_config_params(resource_config_payload,
diff --git a/plugin.yaml b/plugin.yaml
index 537e6002..0123ca36 100644
--- a/plugin.yaml
+++ b/plugin.yaml
@@ -5,9 +5,9 @@
 plugins:
   azure:
     executor: central_deployment_agent
-    source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/3.3.0.zip
+    source: https://github.com/cloudify-cosmo/cloudify-azure-plugin/archive/3.3.1.zip
     package_name: cloudify-azure-plugin
-    package_version: '3.3.0'
+    package_version: '3.3.1'
 
 data_types:
   cloudify.datatypes.azure.Config:
@@ -1700,6 +1700,10 @@ node_types:
       name:
         required: true
         type: string
+        default: { get_property: [ SELF, cluster_name ] }
+      cluster_name:
+        required: false
+        type: string
       resource_config:
         type: cloudify.datatypes.azure.compute.ManagedClusterConfig
         required: true