From 4fc4b82df6660fc704e4f54794d66ad3ab91b56d Mon Sep 17 00:00:00 2001 From: magodo Date: Mon, 23 Dec 2019 17:20:56 +0800 Subject: [PATCH] follow new client get scheme for datasource --- templates/azure/terraform/datasource.erb | 7 +++++-- templates/azure/terraform/resource.erb | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/azure/terraform/datasource.erb b/templates/azure/terraform/datasource.erb index 5a20cf120556..e1ed6d602518 100644 --- a/templates/azure/terraform/datasource.erb +++ b/templates/azure/terraform/datasource.erb @@ -14,6 +14,9 @@ package azurerm flatten_queue = Array.new sdktype = Provider::Azure::Terraform::SDK::TypeDefinitionDescriptor.new sdk_operation, false sdk_marshal = Provider::Azure::Terraform::SDK::MarshalDescriptor.new sdk_package, resource_name, flatten_queue, sdktype, schema_properties + + provider_name = object.api_name + provider_client_name = object.azure_sdk_definition.go_client -%> func dataSource<%= resource_name -%>() *schema.Resource { @@ -31,8 +34,8 @@ func dataSource<%= resource_name -%>() *schema.Resource { } func dataSource<%= resource_name -%>Read(d *schema.ResourceData, meta interface{}) error { - client := meta.(*ArmClient).<%= lines(object.azure_sdk_definition.go_client) -%> - ctx, cancel := timeouts.ForRead(meta.(*ArmClient).StopContext, d) + client := meta.(*clients.Client).<%= provider_name -%>.<%= provider_client_name %> + ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() <% input_properties.sort_by{|p| [p.order, p.name]}.each do |prop| -%> diff --git a/templates/azure/terraform/resource.erb b/templates/azure/terraform/resource.erb index d42a0c8a263c..181b19533e0e 100644 --- a/templates/azure/terraform/resource.erb +++ b/templates/azure/terraform/resource.erb @@ -16,14 +16,13 @@ package azurerm updatable_properties = settable_properties.reject{|p| !object.azure_sdk_definition.update.nil? && get_applicable_reference(p.azure_sdk_references, object.azure_sdk_definition.update.request).nil?} .reject { |p| p.name == "location" } # location is always force new in terraform output_properties = properties.reject{|p| p.name == 'id'} - # Handwritten TF Operation objects will be shaped like accessContextManager while the Google Go Client will have a name like accesscontextmanager + provider_name = object.api_name provider_client_name = object.azure_sdk_definition.go_client -%> <% resource_name = "Arm" + object.name terraform_name = "azurerm_" + object.name.underscore - azure_client_name = object.azure_sdk_definition.go_client sdk_package = object.azure_sdk_definition.go_client_namespace $global_expand_queue = Array.new unless defined? $global_expand_queue