From fe67d9dbf865527510c6693279f4252ebb99f379 Mon Sep 17 00:00:00 2001
From: Kristin Laemmert <mildwonkey@users.noreply.github.com>
Date: Tue, 25 Sep 2018 10:12:56 -0700
Subject: [PATCH] terraform.Schemas: export struct fields

There does not appear to be any real reason that these Schemas fields are
not exported, and exporting them makes it possible to directly construct
Schemas for tests without pulling in an entire context.
---
 terraform/graph_builder_plan_test.go           |  2 +-
 terraform/schemas.go                           | 18 +++++++++---------
 terraform/schemas_test.go                      |  4 ++--
 .../transform_transitive_reduction_test.go     |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/terraform/graph_builder_plan_test.go b/terraform/graph_builder_plan_test.go
index a7bda0e68..25452a723 100644
--- a/terraform/graph_builder_plan_test.go
+++ b/terraform/graph_builder_plan_test.go
@@ -43,7 +43,7 @@ func TestPlanGraphBuilder(t *testing.T) {
 		Config:     testModule(t, "graph-builder-plan-basic"),
 		Components: components,
 		Schemas: &Schemas{
-			providers: map[string]*ProviderSchema{
+			Providers: map[string]*ProviderSchema{
 				"aws":       awsProvider.GetSchemaReturn,
 				"openstack": openstackProvider.GetSchemaReturn,
 			},
diff --git a/terraform/schemas.go b/terraform/schemas.go
index 8423ce2b1..5475fe74b 100644
--- a/terraform/schemas.go
+++ b/terraform/schemas.go
@@ -15,8 +15,8 @@ import (
 // Schemas is a container for various kinds of schema that Terraform needs
 // during processing.
 type Schemas struct {
-	providers    map[string]*ProviderSchema
-	provisioners map[string]*configschema.Block
+	Providers    map[string]*ProviderSchema
+	Provisioners map[string]*configschema.Block
 }
 
 // ProviderSchema returns the entire ProviderSchema object that was produced
@@ -25,10 +25,10 @@ type Schemas struct {
 // It's usually better to go use the more precise methods offered by type
 // Schemas to handle this detail automatically.
 func (ss *Schemas) ProviderSchema(typeName string) *ProviderSchema {
-	if ss.providers == nil {
+	if ss.Providers == nil {
 		return nil
 	}
-	return ss.providers[typeName]
+	return ss.Providers[typeName]
 }
 
 // ProviderConfig returns the schema for the provider configuration of the
@@ -80,7 +80,7 @@ func (ss *Schemas) DataSourceConfig(providerType string, dataSource string) *con
 // ProvisionerConfig returns the schema for the configuration of a given
 // provisioner, or nil of no such schema is available.
 func (ss *Schemas) ProvisionerConfig(name string) *configschema.Block {
-	return ss.provisioners[name]
+	return ss.Provisioners[name]
 }
 
 // LoadSchemas searches the given configuration, state  and plan (any of which
@@ -95,14 +95,14 @@ func (ss *Schemas) ProvisionerConfig(name string) *configschema.Block {
 // still valid but may be incomplete.
 func LoadSchemas(config *configs.Config, state *states.State, components contextComponentFactory) (*Schemas, error) {
 	schemas := &Schemas{
-		providers:    map[string]*ProviderSchema{},
-		provisioners: map[string]*configschema.Block{},
+		Providers:    map[string]*ProviderSchema{},
+		Provisioners: map[string]*configschema.Block{},
 	}
 	var diags tfdiags.Diagnostics
 
-	newDiags := loadProviderSchemas(schemas.providers, config, state, components)
+	newDiags := loadProviderSchemas(schemas.Providers, config, state, components)
 	diags = diags.Append(newDiags)
-	newDiags = loadProvisionerSchemas(schemas.provisioners, config, components)
+	newDiags = loadProvisionerSchemas(schemas.Provisioners, config, components)
 	diags = diags.Append(newDiags)
 
 	return schemas, diags.Err()
diff --git a/terraform/schemas_test.go b/terraform/schemas_test.go
index 85f0dccdd..3f79981ca 100644
--- a/terraform/schemas_test.go
+++ b/terraform/schemas_test.go
@@ -8,10 +8,10 @@ func simpleTestSchemas() *Schemas {
 	provider := simpleMockProvider()
 	provisioner := simpleMockProvisioner()
 	return &Schemas{
-		providers: map[string]*ProviderSchema{
+		Providers: map[string]*ProviderSchema{
 			"test": provider.GetSchemaReturn,
 		},
-		provisioners: map[string]*configschema.Block{
+		Provisioners: map[string]*configschema.Block{
 			"test": provisioner.GetSchemaResponse.Provisioner,
 		},
 	}
diff --git a/terraform/transform_transitive_reduction_test.go b/terraform/transform_transitive_reduction_test.go
index 311a10a09..250978701 100644
--- a/terraform/transform_transitive_reduction_test.go
+++ b/terraform/transform_transitive_reduction_test.go
@@ -31,7 +31,7 @@ func TestTransitiveReductionTransformer(t *testing.T) {
 	{
 		transform := &AttachSchemaTransformer{
 			Schemas: &Schemas{
-				providers: map[string]*ProviderSchema{
+				Providers: map[string]*ProviderSchema{
 					"aws": {
 						ResourceTypes: map[string]*configschema.Block{
 							"aws_instance": &configschema.Block{