Skip to content

put generated files to internal/services/<rp> folder #94

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 24, 2019
Merged

put generated files to internal/services/<rp> folder #94

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
33 changes: 16 additions & 17 deletions provider/azure/terraform_extension.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ def azure_tf_types(map)
end

def azure_generate_resource(data)
dir = "azurerm"
target_folder = File.join(data.output_folder, dir)
rp_name = data.object.api_name.downcase
target_folder = File.join(data.output_folder, 'azurerm', 'internal', 'services', rp_name)
FileUtils.mkpath target_folder

name = data.object.name.underscore
product_name = data.product.name.underscore
filepath = File.join(target_folder, "resource_arm_#{name}.go")

data.generate('templates/azure/terraform/resource.erb', filepath, self)
Expand All @@ -74,18 +74,17 @@ def azure_generate_documentation(data)
FileUtils.mkpath target_folder

name = data.object.name.underscore
product_name = data.product.name.underscore
filepath = File.join(target_folder, "#{name}.html.markdown")

data.generate('templates/azure/terraform/resource.html.markdown.erb', filepath, self)
end

def azure_generate_resource_tests(data)
dir = "azurerm"
target_folder = File.join(data.output_folder, dir)
rp_name = data.object.api_name.downcase
target_folder = File.join(data.output_folder, 'azurerm', 'internal', 'services', rp_name, 'tests')
FileUtils.mkpath target_folder

name = data.object.name.underscore
product_name = data.product.name.underscore
filepath = File.join(target_folder, "resource_arm_#{name}_test.go")

data.product = data.product.name
Expand All @@ -94,22 +93,22 @@ def azure_generate_resource_tests(data)
end

def compile_datasource(data)
dir = 'azurerm'
target_folder = File.join(data.output_folder, dir)
FileUtils.mkpath target_folder

name = data.object.name.underscore
product_name = data.product.name.underscore
rp_name = data.object.api_name.downcase

filepath = File.join(target_folder, "data_source_#{name}.go")
datasource_folder = File.join(data.output_folder, 'azurerm', 'internal', 'services', rp_name)
FileUtils.mkpath datasource_folder
filepath = File.join(datasource_folder, "data_source_#{name}.go")
data.generate('templates/azure/terraform/datasource.erb', filepath, self)

filepath = File.join(target_folder, "data_source_#{name}_test.go")
datasource_test_folder = File.join(datasource_folder, 'tests')
FileUtils.mkpath datasource_test_folder
filepath = File.join(datasource_test_folder, "data_source_#{name}_test.go")
data.generate('templates/azure/terraform/datasource_test.go.erb', filepath, self)

target_folder = File.join(data.output_folder, 'website', 'docs', 'd')
FileUtils.mkpath target_folder
filepath = File.join(target_folder, "#{name}.html.markdown")
datasource_doc_folder = File.join(data.output_folder, 'website', 'docs', 'd')
FileUtils.mkpath datasource_doc_folder
filepath = File.join(datasource_doc_folder, "#{name}.html.markdown")
data.generate('templates/azure/terraform/datasource.html.markdown.erb', filepath, self)
end
end
Expand Down
1 change: 0 additions & 1 deletion templates/azure/terraform/datasource.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%# lines(autogen_notice :go) -%>

package azurerm

<%
Expand Down
1 change: 0 additions & 1 deletion templates/azure/terraform/datasource_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%# lines(autogen_notice :go) -%>

package azurerm

import (
Expand Down
1 change: 0 additions & 1 deletion templates/azure/terraform/resource.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%# lines(autogen_notice :go) -%>

package azurerm

<%= lines(compile(object.custom_code.constants)) if object.custom_code.constants -%>
Expand Down
5 changes: 2 additions & 3 deletions templates/azure/terraform/test_file.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<%# lines(autogen_notice :go) -%>

package azurerm

import (
Expand Down Expand Up @@ -82,7 +81,7 @@ func testCheck<%= resource_name -%>Exists(resourceName string) resource.TestChec

<%= lines(build_acctest_parameters_from_schema(object.azure_sdk_definition.read, properties)) -%>

client := acceptance.AzureProvider.Meta().(*clients.Client).<% provider_name -%>.<%= provider_client_name -%>
client := acceptance.AzureProvider.Meta().(*clients.Client).<%= provider_name -%>.<%= provider_client_name -%>

ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext

Expand All @@ -99,7 +98,7 @@ func testCheck<%= resource_name -%>Exists(resourceName string) resource.TestChec
}

func testCheck<%= resource_name -%>Destroy(s *terraform.State) error {
client := acceptance.AzureProvider.Meta().(*clients.Client).<% provider_name -%>.<%= provider_client_name -%>
client := acceptance.AzureProvider.Meta().(*clients.Client).<%= provider_name -%>.<%= provider_client_name -%>

ctx := acceptance.AzureProvider.Meta().(*clients.Client).StopContext

Expand Down