Skip to content

follow new client get scheme for datasource #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
magodo merged 1 commit into from
Dec 23, 2019
Merged

follow new client get scheme for datasource #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions templates/azure/terraform/datasource.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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| -%>
Expand Down
3 changes: 1 addition & 2 deletions templates/azure/terraform/resource.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down