Skip to content

Commit

Permalink
[Spring Cloud] fix check active deployment (Azure#3123)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ninpan-ms
ninpan-ms authored Mar 10, 2021
1 parent 9998c47 commit c2f35e3
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 18 deletions.
2 changes: 1 addition & 1 deletion src/spring-cloud/azext_spring_cloud/commands.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def load_command_table(self, _):
'show', 'deployment_get', table_transformer=transform_spring_cloud_deployment_output)
g.custom_command('delete', 'deployment_delete')

with self.command_group('spring-cloud app binding', client_factory=cf_bindings) as g:
with self.command_group('spring-cloud app binding', client_factory=cf_spring_cloud) as g:
g.custom_command('list', 'binding_list')
g.custom_show_command('show', 'binding_get')
g.custom_command('cosmos add', 'binding_cosmos_add')
Expand Down
38 changes: 23 additions & 15 deletions src/spring-cloud/azext_spring_cloud/custom.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1032,15 +1032,17 @@ def config_repo_list(cmd, client, resource_group, name):


def binding_list(cmd, client, resource_group, service, app):
return client.list(resource_group, service, app)
_check_active_deployment_exist(client, resource_group, service, app)
return client.bindings.list(resource_group, service, app)


def binding_get(cmd, client, resource_group, service, app, name):
return client.get(resource_group, service, app, name)
_check_active_deployment_exist(client, resource_group, service, app)
return client.bindings.get(resource_group, service, app, name)


def binding_remove(cmd, client, resource_group, service, app, name):
return client.delete(resource_group, service, app, name)
return client.bindings.delete(resource_group, service, app, name)


def binding_cosmos_add(cmd, client, resource_group, service, app, name,
Expand All @@ -1049,6 +1051,7 @@ def binding_cosmos_add(cmd, client, resource_group, service, app, name,
database_name=None,
key_space=None,
collection_name=None):
_check_active_deployment_exist(client, resource_group, service, app)
resource_id_dict = parse_resource_id(resource_id)
resource_type = resource_id_dict['resource_type']
resource_name = resource_id_dict['resource_name']
Expand All @@ -1062,7 +1065,7 @@ def binding_cosmos_add(cmd, client, resource_group, service, app, name,
binding_parameters['collectionName'] = collection_name

try:
primary_key = _get_cosmosdb_primary_key(client, resource_id)
primary_key = _get_cosmosdb_primary_key(client.bindings, resource_id)
except:
raise CLIError(
"Couldn't get cosmosdb {}'s primary key".format(resource_name))
Expand All @@ -1074,14 +1077,15 @@ def binding_cosmos_add(cmd, client, resource_group, service, app, name,
key=primary_key,
binding_parameters=binding_parameters
)
return client.create_or_update(resource_group, service, app, name, properties)
return client.bindings.create_or_update(resource_group, service, app, name, properties)


def binding_cosmos_update(cmd, client, resource_group, service, app, name,
database_name=None,
key_space=None,
collection_name=None):
binding = client.get(resource_group, service, app, name).properties
_check_active_deployment_exist(client, resource_group, service, app)
binding = client.bindings.get(resource_group, service, app, name).properties
resource_id = binding.resource_id
resource_name = binding.resource_name
binding_parameters = {}
Expand All @@ -1090,7 +1094,7 @@ def binding_cosmos_update(cmd, client, resource_group, service, app, name,
binding_parameters['collectionName'] = collection_name

try:
primary_key = _get_cosmosdb_primary_key(client, resource_id)
primary_key = _get_cosmosdb_primary_key(client.bindings, resource_id)
except:
raise CLIError(
"Couldn't get cosmosdb {}'s primary key".format(resource_name))
Expand All @@ -1099,14 +1103,15 @@ def binding_cosmos_update(cmd, client, resource_group, service, app, name,
key=primary_key,
binding_parameters=binding_parameters
)
return client.update(resource_group, service, app, name, properties)
return client.bindings.update(resource_group, service, app, name, properties)


def binding_mysql_add(cmd, client, resource_group, service, app, name,
resource_id,
key,
username,
database_name):
_check_active_deployment_exist(client, resource_group, service, app)
resource_id_dict = parse_resource_id(resource_id)
resource_type = resource_id_dict['resource_type']
resource_name = resource_id_dict['resource_name']
Expand All @@ -1121,13 +1126,14 @@ def binding_mysql_add(cmd, client, resource_group, service, app, name,
key=key,
binding_parameters=binding_parameters
)
return client.create_or_update(resource_group, service, app, name, properties)
return client.bindings.create_or_update(resource_group, service, app, name, properties)


def binding_mysql_update(cmd, client, resource_group, service, app, name,
key=None,
username=None,
database_name=None):
_check_active_deployment_exist(client, resource_group, service, app)
binding_parameters = {}
binding_parameters['username'] = username
binding_parameters['databaseName'] = database_name
Expand All @@ -1136,12 +1142,13 @@ def binding_mysql_update(cmd, client, resource_group, service, app, name,
key=key,
binding_parameters=binding_parameters
)
return client.update(resource_group, service, app, name, properties)
return client.bindings.update(resource_group, service, app, name, properties)


def binding_redis_add(cmd, client, resource_group, service, app, name,
resource_id,
disable_ssl=None):
_check_active_deployment_exist(client, resource_group, service, app)
use_ssl = not disable_ssl
resource_id_dict = parse_resource_id(resource_id)
resource_type = resource_id_dict['resource_type']
Expand All @@ -1150,7 +1157,7 @@ def binding_redis_add(cmd, client, resource_group, service, app, name,
binding_parameters['useSsl'] = use_ssl
primary_key = None
try:
primary_key = _get_redis_primary_key(client, resource_id)
primary_key = _get_redis_primary_key(client.bindings, resource_id)
except:
raise CLIError(
"Couldn't get redis {}'s primary key".format(resource_name))
Expand All @@ -1163,12 +1170,13 @@ def binding_redis_add(cmd, client, resource_group, service, app, name,
binding_parameters=binding_parameters
)

return client.create_or_update(resource_group, service, app, name, properties)
return client.bindings.create_or_update(resource_group, service, app, name, properties)


def binding_redis_update(cmd, client, resource_group, service, app, name,
disable_ssl=None):
binding = client.get(resource_group, service, app, name).properties
_check_active_deployment_exist(client, resource_group, service, app)
binding = client.bindings.get(resource_group, service, app, name).properties
resource_id = binding.resource_id
resource_name = binding.resource_name
binding_parameters = {}
Expand All @@ -1177,7 +1185,7 @@ def binding_redis_update(cmd, client, resource_group, service, app, name,

primary_key = None
try:
primary_key = _get_redis_primary_key(client, resource_id)
primary_key = _get_redis_primary_key(client.bindings, resource_id)
except:
raise CLIError(
"Couldn't get redis {}'s primary key".format(resource_name))
Expand All @@ -1186,7 +1194,7 @@ def binding_redis_update(cmd, client, resource_group, service, app, name,
key=primary_key,
binding_parameters=binding_parameters
)
return client.update(resource_group, service, app, name, properties)
return client.bindings.update(resource_group, service, app, name, properties)


def _get_cosmosdb_primary_key(client, resource_id):
Expand Down
2 changes: 0 additions & 2 deletions src/spring-cloud/setup.cfg
View file
Original file line number Diff line number Diff line change
@@ -1,2 +0,0 @@
[bdist_wheel]
universal=1

0 comments on commit c2f35e3

Please sign in to comment.