Remove usage of terraform.yaml template fie

mmv1/compiler.rb

@@ -156,10 +156,10 @@
   api_override_path = File.join(override_dir, product_name, 'api.yaml') if override_dir
   api_yaml_path = File.join(product_name, 'api.yaml')
 
-  provider_override_path = ''
-  provider_override_path = File.join(override_dir, product_name, "#{provider_name}.yaml") \
-    if override_dir
-  provider_yaml_path = File.join(product_name, "#{provider_name}.yaml")
+  # provider_override_path = ''
+  # provider_override_path = File.join(override_dir, product_name, "#{provider_name}.yaml") \
+  #   if override_dir
+  # provider_yaml_path = File.join(product_name, "#{provider_name}.yaml")
 
   unless File.exist?(product_yaml_path) || File.exist?(product_override_path) \
     || File.exist?(api_yaml_path) || File.exist?(api_override_path)
@@ -188,13 +188,13 @@
     product_yaml = File.read(product_yaml_path)
   end
 
-  unless File.exist?(provider_yaml_path) || File.exist?(provider_override_path)
-    unless File.exist?(product_yaml_path) || File.exist?(product_override_path)
-      Google::LOGGER.info "#{product_name}: Skipped as no #{provider_name}.yaml file exists"
-      next
-    end
-    provider_yaml_path = 'templates/terraform.yaml'
-  end
+  # unless File.exist?(provider_yaml_path) || File.exist?(provider_override_path)
+  #   unless File.exist?(product_yaml_path) || File.exist?(product_override_path)
+  #     Google::LOGGER.info "#{product_name}: Skipped as no #{provider_name}.yaml file exists"
+  #     next
+  #   end
+  #   provider_yaml_path = 'templates/terraform.yaml'
+  # end
 
   raise "Output path '#{output_path}' does not exist or is not a directory" \
     unless Dir.exist?(output_path)
@@ -209,6 +209,8 @@
     next
   end
 
+  Google::LOGGER.info "#{product_yaml_path}: product_yaml_path"
+
   if File.exist?(product_yaml_path) || File.exist?(product_override_path)
     resources = []
     Dir["#{product_name}/*"].each do |file_path|
@@ -262,22 +264,33 @@
     product_api.set_variable(resources, 'objects')
   end
 
-  if File.exist?(provider_yaml_path)
-    product_api, provider_config, = \
-      Provider::Config.parse(provider_yaml_path, product_api, version)
-  end
-  # Load any dynamic overrides passed in with -r
-  if File.exist?(provider_override_path)
-    product_api, provider_config, = \
-      Provider::Config.parse(provider_override_path, product_api, version, override_dir)
-  end
+  # Google::LOGGER.info "#{provider_yaml_path}: provider_yaml_path"
+  # Google::LOGGER.info "#{provider_override_path}: provider_override_path"
+
+  # Google::LOGGER.info "#{product_api}: Compiling provider config product_api 0"
+
+  # if File.exist?(provider_yaml_path)
+  #   product_api, provider_config, = \
+  #     Provider::Config.parse(provider_yaml_path, product_api, version)
+  # end
+  # # Load any dynamic overrides passed in with -r
+  # if File.exist?(provider_override_path)
+  #   product_api, provider_config, = \
+  #     Provider::Config.parse(provider_override_path, product_api, version, override_dir)
+  # end
+
+  provider_config = nil
+  product_api&.validate
+
+  # Google::LOGGER.info "#{product_api}: Compiling provider config product_api"
+  # Google::LOGGER.info "#{provider_config}: Compiling provider config provider_config"
 
   Google::LOGGER.info "#{product_name}: Compiling provider config"
-  pp provider_config if ENV['COMPILER_DEBUG']
+  # pp provider_config if ENV['COMPILER_DEBUG']
 
   if force_provider.nil?
     provider = \
-      provider_config.provider.new(provider_config, product_api, version, start_time)
+      Provider::Terraform.new(provider_config, product_api, version, start_time)
   else
     override_providers = {
       'oics' => Provider::TerraformOiCS,

mmv1/provider/terraform.rb

@@ -91,8 +91,8 @@ def generate(output_folder, types, product_path, dump_yaml, generate_code, gener
       # common-compile.yaml is a special file that will get compiled by the last product
       # used in a single invocation of the compiled. It should not contain product-specific
       # information; instead, it should be run-specific such as the version to compile at.
-      compile_product_files(output_folder) \
-        unless @config.files.nil? || @config.files.compile.nil?
+      # compile_product_files(output_folder) \
+      #   unless @config.files.nil? || @config.files.compile.nil?
 
       FileUtils.mkpath output_folder
       pwd = Dir.pwd
@@ -160,16 +160,16 @@ def copy_file_list(output_folder, files)
     end
 
     # Compiles files specified within the product
-    def compile_product_files(output_folder)
-      file_template = ProductFileTemplate.new(
-        output_folder,
-        nil,
-        @api,
-        @target_version_name,
-        build_env
-      )
-      compile_file_list(output_folder, @config.files.compile, file_template)
-    end
+    # def compile_product_files(output_folder)
+    #   file_template = ProductFileTemplate.new(
+    #     output_folder,
+    #     nil,
+    #     @api,
+    #     @target_version_name,
+    #     build_env
+    #   )
+    #   compile_file_list(output_folder, @config.files.compile, file_template)
+    # end
 
     # Compiles files that are shared at the provider level
     def compile_common_files(

mmv1/provider/terraform/config.rb

@@ -11,12 +11,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'provider/config'
+# require 'provider/config'
 
 module Provider
   class Terraform
     # Settings for the provider
-    class Config < Provider::Config
+    class Config
       def provider
         Provider::Terraform
       end