public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-06-29 06:42:36 +00:00
Code Issues Projects Releases Wiki Activity

Capitalization changes in generated resources (#2846)

Browse Source 
<!-- This change is generated by MagicModules. -->
/cc @rileykarson
This commit is contained in:
The Magician 2019-01-09 13:42:12 -08:00 committed by Riley Karson
parent 98d2972c31
commit f08a492cd5
12 changed files with 183 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
google/provider.go
View File

@ -115,13 +115,13 @@ func ResourceMap() map[string]*schema.Resource {
func ResourceMapWithErrors() (map[string]*schema.Resource, error) {
return mergeResourceMaps(
GeneratedAppengineResourcesMap,
GeneratedAppEngineResourcesMap,
GeneratedComputeResourcesMap,
GeneratedCloudbuildResourcesMap,
GeneratedCloudBuildResourcesMap,
GeneratedDnsResourcesMap,
GeneratedRedisResourcesMap,
GeneratedResourceManagerResourcesMap,
GeneratedSourcerepoResourcesMap,
GeneratedSourceRepoResourcesMap,
GeneratedStorageResourcesMap,
GeneratedMonitoringResourcesMap,
map[string]*schema.Resource{

4
google/provider_appengine_gen.go
View File

@ -16,6 +16,6 @@ package google
import "github.com/hashicorp/terraform/helper/schema"
var GeneratedAppengineResourcesMap = map[string]*schema.Resource{
"google_appengine_firewall_rule": resourceAppengineFirewallRule(),
var GeneratedAppEngineResourcesMap = map[string]*schema.Resource{
"google_appengine_firewall_rule": resourceAppEngineFirewallRule(),
}

4
google/provider_cloudbuild_gen.go
View File

@ -16,6 +16,6 @@ package google
import "github.com/hashicorp/terraform/helper/schema"
var GeneratedCloudbuildResourcesMap = map[string]*schema.Resource{
"google_cloudbuild_trigger": resourceCloudbuildTrigger(),
var GeneratedCloudBuildResourcesMap = map[string]*schema.Resource{
"google_cloudbuild_trigger": resourceCloudBuildTrigger(),
}

4
google/provider_sourcerepo_gen.go
View File

@ -16,6 +16,6 @@ package google
import "github.com/hashicorp/terraform/helper/schema"
var GeneratedSourcerepoResourcesMap = map[string]*schema.Resource{
"google_sourcerepo_repository": resourceSourcerepoRepository(),
var GeneratedSourceRepoResourcesMap = map[string]*schema.Resource{
"google_sourcerepo_repository": resourceSourceRepoRepository(),
}

68
google/resource_appengine_firewall_rule.go
View File

@ -26,15 +26,15 @@ import (
"github.com/hashicorp/terraform/helper/validation"
)
func resourceAppengineFirewallRule() *schema.Resource {
func resourceAppEngineFirewallRule() *schema.Resource {
return &schema.Resource{
Create: resourceAppengineFirewallRuleCreate,
Read: resourceAppengineFirewallRuleRead,
Update: resourceAppengineFirewallRuleUpdate,
Delete: resourceAppengineFirewallRuleDelete,
Create: resourceAppEngineFirewallRuleCreate,
Read: resourceAppEngineFirewallRuleRead,
Update: resourceAppEngineFirewallRuleUpdate,
Delete: resourceAppEngineFirewallRuleDelete,
Importer: &schema.ResourceImporter{
State: resourceAppengineFirewallRuleImport,
State: resourceAppEngineFirewallRuleImport,
},
Timeouts: &schema.ResourceTimeout{
@ -71,29 +71,29 @@ func resourceAppengineFirewallRule() *schema.Resource {
}
}
func resourceAppengineFirewallRuleCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAppEngineFirewallRuleCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
obj := make(map[string]interface{})
descriptionProp, err := expandAppengineFirewallRuleDescription(d.Get("description"), d, config)
descriptionProp, err := expandAppEngineFirewallRuleDescription(d.Get("description"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(descriptionProp)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
obj["description"] = descriptionProp
}
sourceRangeProp, err := expandAppengineFirewallRuleSourceRange(d.Get("source_range"), d, config)
sourceRangeProp, err := expandAppEngineFirewallRuleSourceRange(d.Get("source_range"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("source_range"); !isEmptyValue(reflect.ValueOf(sourceRangeProp)) && (ok || !reflect.DeepEqual(v, sourceRangeProp)) {
obj["sourceRange"] = sourceRangeProp
}
actionProp, err := expandAppengineFirewallRuleAction(d.Get("action"), d, config)
actionProp, err := expandAppEngineFirewallRuleAction(d.Get("action"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("action"); !isEmptyValue(reflect.ValueOf(actionProp)) && (ok || !reflect.DeepEqual(v, actionProp)) {
obj["action"] = actionProp
}
priorityProp, err := expandAppengineFirewallRulePriority(d.Get("priority"), d, config)
priorityProp, err := expandAppEngineFirewallRulePriority(d.Get("priority"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("priority"); !isEmptyValue(reflect.ValueOf(priorityProp)) && (ok || !reflect.DeepEqual(v, priorityProp)) {
@ -120,10 +120,10 @@ func resourceAppengineFirewallRuleCreate(d *schema.ResourceData, meta interface{
log.Printf("[DEBUG] Finished creating FirewallRule %q: %#v", d.Id(), res)
return resourceAppengineFirewallRuleRead(d, meta)
return resourceAppEngineFirewallRuleRead(d, meta)
}
func resourceAppengineFirewallRuleRead(d *schema.ResourceData, meta interface{}) error {
func resourceAppEngineFirewallRuleRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
url, err := replaceVars(d, config, "https://appengine.googleapis.com/v1/apps/{{project}}/firewall/ingressRules/{{priority}}")
@ -133,7 +133,7 @@ func resourceAppengineFirewallRuleRead(d *schema.ResourceData, meta interface{})
res, err := sendRequest(config, "GET", url, nil)
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("AppengineFirewallRule %q", d.Id()))
return handleNotFoundError(err, d, fmt.Sprintf("AppEngineFirewallRule %q", d.Id()))
}
project, err := getProject(d, config)
@ -144,45 +144,45 @@ func resourceAppengineFirewallRuleRead(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error reading FirewallRule: %s", err)
}
if err := d.Set("description", flattenAppengineFirewallRuleDescription(res["description"], d)); err != nil {
if err := d.Set("description", flattenAppEngineFirewallRuleDescription(res["description"], d)); err != nil {
return fmt.Errorf("Error reading FirewallRule: %s", err)
}
if err := d.Set("source_range", flattenAppengineFirewallRuleSourceRange(res["sourceRange"], d)); err != nil {
if err := d.Set("source_range", flattenAppEngineFirewallRuleSourceRange(res["sourceRange"], d)); err != nil {
return fmt.Errorf("Error reading FirewallRule: %s", err)
}
if err := d.Set("action", flattenAppengineFirewallRuleAction(res["action"], d)); err != nil {
if err := d.Set("action", flattenAppEngineFirewallRuleAction(res["action"], d)); err != nil {
return fmt.Errorf("Error reading FirewallRule: %s", err)
}
if err := d.Set("priority", flattenAppengineFirewallRulePriority(res["priority"], d)); err != nil {
if err := d.Set("priority", flattenAppEngineFirewallRulePriority(res["priority"], d)); err != nil {
return fmt.Errorf("Error reading FirewallRule: %s", err)
}
return nil
}
func resourceAppengineFirewallRuleUpdate(d *schema.ResourceData, meta interface{}) error {
func resourceAppEngineFirewallRuleUpdate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
obj := make(map[string]interface{})
descriptionProp, err := expandAppengineFirewallRuleDescription(d.Get("description"), d, config)
descriptionProp, err := expandAppEngineFirewallRuleDescription(d.Get("description"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
obj["description"] = descriptionProp
}
sourceRangeProp, err := expandAppengineFirewallRuleSourceRange(d.Get("source_range"), d, config)
sourceRangeProp, err := expandAppEngineFirewallRuleSourceRange(d.Get("source_range"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("source_range"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, sourceRangeProp)) {
obj["sourceRange"] = sourceRangeProp
}
actionProp, err := expandAppengineFirewallRuleAction(d.Get("action"), d, config)
actionProp, err := expandAppEngineFirewallRuleAction(d.Get("action"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("action"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, actionProp)) {
obj["action"] = actionProp
}
priorityProp, err := expandAppengineFirewallRulePriority(d.Get("priority"), d, config)
priorityProp, err := expandAppEngineFirewallRulePriority(d.Get("priority"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("priority"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, priorityProp)) {
@ -224,10 +224,10 @@ func resourceAppengineFirewallRuleUpdate(d *schema.ResourceData, meta interface{
return fmt.Errorf("Error updating FirewallRule %q: %s", d.Id(), err)
}
return resourceAppengineFirewallRuleRead(d, meta)
return resourceAppEngineFirewallRuleRead(d, meta)
}
func resourceAppengineFirewallRuleDelete(d *schema.ResourceData, meta interface{}) error {
func resourceAppEngineFirewallRuleDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
url, err := replaceVars(d, config, "https://appengine.googleapis.com/v1/apps/{{project}}/firewall/ingressRules/{{priority}}")
@ -246,7 +246,7 @@ func resourceAppengineFirewallRuleDelete(d *schema.ResourceData, meta interface{
return nil
}
func resourceAppengineFirewallRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
func resourceAppEngineFirewallRuleImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
config := meta.(*Config)
if err := parseImportId([]string{"(?P<project>[^/]+)/(?P<priority>[^/]+)", "(?P<priority>[^/]+)"}, d, config); err != nil {
return nil, err
@ -262,19 +262,19 @@ func resourceAppengineFirewallRuleImport(d *schema.ResourceData, meta interface{
return []*schema.ResourceData{d}, nil
}
func flattenAppengineFirewallRuleDescription(v interface{}, d *schema.ResourceData) interface{} {
func flattenAppEngineFirewallRuleDescription(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenAppengineFirewallRuleSourceRange(v interface{}, d *schema.ResourceData) interface{} {
func flattenAppEngineFirewallRuleSourceRange(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenAppengineFirewallRuleAction(v interface{}, d *schema.ResourceData) interface{} {
func flattenAppEngineFirewallRuleAction(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenAppengineFirewallRulePriority(v interface{}, d *schema.ResourceData) interface{} {
func flattenAppEngineFirewallRulePriority(v interface{}, d *schema.ResourceData) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
@ -284,18 +284,18 @@ func flattenAppengineFirewallRulePriority(v interface{}, d *schema.ResourceData)
return v
}
func expandAppengineFirewallRuleDescription(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandAppEngineFirewallRuleDescription(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandAppengineFirewallRuleSourceRange(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandAppEngineFirewallRuleSourceRange(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandAppengineFirewallRuleAction(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandAppEngineFirewallRuleAction(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandAppengineFirewallRulePriority(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandAppEngineFirewallRulePriority(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}

12
google/resource_appengine_firewall_rule_generated_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/hashicorp/terraform/terraform"
)
func TestAccAppengineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T) {
func TestAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T) {
t.Parallel()
context := map[string]interface{}{
@ -35,10 +35,10 @@ func TestAccAppengineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckAppengineFirewallRuleDestroy,
CheckDestroy: testAccCheckAppEngineFirewallRuleDestroy,
Steps: []resource.TestStep{
{
Config: testAccAppengineFirewallRule_appengineFirewallRuleBasicExample(context),
Config: testAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(context),
},
{
ResourceName: "google_appengine_firewall_rule.rule",
@ -49,7 +49,7 @@ func TestAccAppengineFirewallRule_appengineFirewallRuleBasicExample(t *testing.T
})
}
func testAccAppengineFirewallRule_appengineFirewallRuleBasicExample(context map[string]interface{}) string {
func testAccAppEngineFirewallRule_appengineFirewallRuleBasicExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_project" "my_project" {
name = "tf-test-project"
@ -71,7 +71,7 @@ resource "google_appengine_firewall_rule" "rule" {
`, context)
}
func testAccCheckAppengineFirewallRuleDestroy(s *terraform.State) error {
func testAccCheckAppEngineFirewallRuleDestroy(s *terraform.State) error {
for name, rs := range s.RootModule().Resources {
if rs.Type != "google_appengine_firewall_rule" {
continue
@ -89,7 +89,7 @@ func testAccCheckAppengineFirewallRuleDestroy(s *terraform.State) error {
_, err = sendRequest(config, "GET", url, nil)
if err == nil {
return fmt.Errorf("AppengineFirewallRule still exists at %s", url)
return fmt.Errorf("AppEngineFirewallRule still exists at %s", url)
}
}

200
google/resource_cloudbuild_trigger.go
View File

@ -23,15 +23,15 @@ import (
"github.com/hashicorp/terraform/helper/schema"
)
func resourceCloudbuildTrigger() *schema.Resource {
func resourceCloudBuildTrigger() *schema.Resource {
return &schema.Resource{
Create: resourceCloudbuildTriggerCreate,
Read: resourceCloudbuildTriggerRead,
Update: resourceCloudbuildTriggerUpdate,
Delete: resourceCloudbuildTriggerDelete,
Create: resourceCloudBuildTriggerCreate,
Read: resourceCloudBuildTriggerRead,
Update: resourceCloudBuildTriggerUpdate,
Delete: resourceCloudBuildTriggerDelete,
Importer: &schema.ResourceImporter{
State: resourceCloudbuildTriggerImport,
State: resourceCloudBuildTriggerImport,
},
Timeouts: &schema.ResourceTimeout{
@ -173,53 +173,53 @@ func resourceCloudbuildTrigger() *schema.Resource {
}
}
func resourceCloudbuildTriggerCreate(d *schema.ResourceData, meta interface{}) error {
func resourceCloudBuildTriggerCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
obj := make(map[string]interface{})
descriptionProp, err := expandCloudbuildTriggerDescription(d.Get("description"), d, config)
descriptionProp, err := expandCloudBuildTriggerDescription(d.Get("description"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(descriptionProp)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
obj["description"] = descriptionProp
}
disabledProp, err := expandCloudbuildTriggerDisabled(d.Get("disabled"), d, config)
disabledProp, err := expandCloudBuildTriggerDisabled(d.Get("disabled"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("disabled"); !isEmptyValue(reflect.ValueOf(disabledProp)) && (ok || !reflect.DeepEqual(v, disabledProp)) {
obj["disabled"] = disabledProp
}
substitutionsProp, err := expandCloudbuildTriggerSubstitutions(d.Get("substitutions"), d, config)
substitutionsProp, err := expandCloudBuildTriggerSubstitutions(d.Get("substitutions"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("substitutions"); !isEmptyValue(reflect.ValueOf(substitutionsProp)) && (ok || !reflect.DeepEqual(v, substitutionsProp)) {
obj["substitutions"] = substitutionsProp
}
filenameProp, err := expandCloudbuildTriggerFilename(d.Get("filename"), d, config)
filenameProp, err := expandCloudBuildTriggerFilename(d.Get("filename"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("filename"); !isEmptyValue(reflect.ValueOf(filenameProp)) && (ok || !reflect.DeepEqual(v, filenameProp)) {
obj["filename"] = filenameProp
}
ignoredFilesProp, err := expandCloudbuildTriggerIgnoredFiles(d.Get("ignored_files"), d, config)
ignoredFilesProp, err := expandCloudBuildTriggerIgnoredFiles(d.Get("ignored_files"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("ignored_files"); !isEmptyValue(reflect.ValueOf(ignoredFilesProp)) && (ok || !reflect.DeepEqual(v, ignoredFilesProp)) {
obj["ignoredFiles"] = ignoredFilesProp
}
includedFilesProp, err := expandCloudbuildTriggerIncludedFiles(d.Get("included_files"), d, config)
includedFilesProp, err := expandCloudBuildTriggerIncludedFiles(d.Get("included_files"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("included_files"); !isEmptyValue(reflect.ValueOf(includedFilesProp)) && (ok || !reflect.DeepEqual(v, includedFilesProp)) {
obj["includedFiles"] = includedFilesProp
}
triggerTemplateProp, err := expandCloudbuildTriggerTriggerTemplate(d.Get("trigger_template"), d, config)
triggerTemplateProp, err := expandCloudBuildTriggerTriggerTemplate(d.Get("trigger_template"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("trigger_template"); !isEmptyValue(reflect.ValueOf(triggerTemplateProp)) && (ok || !reflect.DeepEqual(v, triggerTemplateProp)) {
obj["triggerTemplate"] = triggerTemplateProp
}
buildProp, err := expandCloudbuildTriggerBuild(d.Get("build"), d, config)
buildProp, err := expandCloudBuildTriggerBuild(d.Get("build"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("build"); !isEmptyValue(reflect.ValueOf(buildProp)) && (ok || !reflect.DeepEqual(v, buildProp)) {
@ -261,10 +261,10 @@ func resourceCloudbuildTriggerCreate(d *schema.ResourceData, meta interface{}) e
}
d.SetId(id)
return resourceCloudbuildTriggerRead(d, meta)
return resourceCloudBuildTriggerRead(d, meta)
}
func resourceCloudbuildTriggerRead(d *schema.ResourceData, meta interface{}) error {
func resourceCloudBuildTriggerRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
url, err := replaceVars(d, config, "https://cloudbuild.googleapis.com/v1/projects/{{project}}/triggers/{{trigger_id}}")
@ -274,7 +274,7 @@ func resourceCloudbuildTriggerRead(d *schema.ResourceData, meta interface{}) err
res, err := sendRequest(config, "GET", url, nil)
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("CloudbuildTrigger %q", d.Id()))
return handleNotFoundError(err, d, fmt.Sprintf("CloudBuildTrigger %q", d.Id()))
}
project, err := getProject(d, config)
@ -285,75 +285,75 @@ func resourceCloudbuildTriggerRead(d *schema.ResourceData, meta interface{}) err
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("trigger_id", flattenCloudbuildTriggerTrigger_id(res["id"], d)); err != nil {
if err := d.Set("trigger_id", flattenCloudBuildTriggerTrigger_id(res["id"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("description", flattenCloudbuildTriggerDescription(res["description"], d)); err != nil {
if err := d.Set("description", flattenCloudBuildTriggerDescription(res["description"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("disabled", flattenCloudbuildTriggerDisabled(res["disabled"], d)); err != nil {
if err := d.Set("disabled", flattenCloudBuildTriggerDisabled(res["disabled"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("create_time", flattenCloudbuildTriggerCreateTime(res["createTime"], d)); err != nil {
if err := d.Set("create_time", flattenCloudBuildTriggerCreateTime(res["createTime"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("substitutions", flattenCloudbuildTriggerSubstitutions(res["substitutions"], d)); err != nil {
if err := d.Set("substitutions", flattenCloudBuildTriggerSubstitutions(res["substitutions"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("filename", flattenCloudbuildTriggerFilename(res["filename"], d)); err != nil {
if err := d.Set("filename", flattenCloudBuildTriggerFilename(res["filename"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("ignored_files", flattenCloudbuildTriggerIgnoredFiles(res["ignoredFiles"], d)); err != nil {
if err := d.Set("ignored_files", flattenCloudBuildTriggerIgnoredFiles(res["ignoredFiles"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("included_files", flattenCloudbuildTriggerIncludedFiles(res["includedFiles"], d)); err != nil {
if err := d.Set("included_files", flattenCloudBuildTriggerIncludedFiles(res["includedFiles"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("trigger_template", flattenCloudbuildTriggerTriggerTemplate(res["triggerTemplate"], d)); err != nil {
if err := d.Set("trigger_template", flattenCloudBuildTriggerTriggerTemplate(res["triggerTemplate"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
if err := d.Set("build", flattenCloudbuildTriggerBuild(res["build"], d)); err != nil {
if err := d.Set("build", flattenCloudBuildTriggerBuild(res["build"], d)); err != nil {
return fmt.Errorf("Error reading Trigger: %s", err)
}
return nil
}
func resourceCloudbuildTriggerUpdate(d *schema.ResourceData, meta interface{}) error {
func resourceCloudBuildTriggerUpdate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
obj := make(map[string]interface{})
descriptionProp, err := expandCloudbuildTriggerDescription(d.Get("description"), d, config)
descriptionProp, err := expandCloudBuildTriggerDescription(d.Get("description"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, descriptionProp)) {
obj["description"] = descriptionProp
}
disabledProp, err := expandCloudbuildTriggerDisabled(d.Get("disabled"), d, config)
disabledProp, err := expandCloudBuildTriggerDisabled(d.Get("disabled"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("disabled"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, disabledProp)) {
obj["disabled"] = disabledProp
}
substitutionsProp, err := expandCloudbuildTriggerSubstitutions(d.Get("substitutions"), d, config)
substitutionsProp, err := expandCloudBuildTriggerSubstitutions(d.Get("substitutions"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("substitutions"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, substitutionsProp)) {
obj["substitutions"] = substitutionsProp
}
filenameProp, err := expandCloudbuildTriggerFilename(d.Get("filename"), d, config)
filenameProp, err := expandCloudBuildTriggerFilename(d.Get("filename"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("filename"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, filenameProp)) {
obj["filename"] = filenameProp
}
triggerTemplateProp, err := expandCloudbuildTriggerTriggerTemplate(d.Get("trigger_template"), d, config)
triggerTemplateProp, err := expandCloudBuildTriggerTriggerTemplate(d.Get("trigger_template"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("trigger_template"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, triggerTemplateProp)) {
obj["triggerTemplate"] = triggerTemplateProp
}
buildProp, err := expandCloudbuildTriggerBuild(d.Get("build"), d, config)
buildProp, err := expandCloudBuildTriggerBuild(d.Get("build"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("build"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, buildProp)) {
@ -373,10 +373,10 @@ func resourceCloudbuildTriggerUpdate(d *schema.ResourceData, meta interface{}) e
return fmt.Errorf("Error updating Trigger %q: %s", d.Id(), err)
}
return resourceCloudbuildTriggerRead(d, meta)
return resourceCloudBuildTriggerRead(d, meta)
}
func resourceCloudbuildTriggerDelete(d *schema.ResourceData, meta interface{}) error {
func resourceCloudBuildTriggerDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
url, err := replaceVars(d, config, "https://cloudbuild.googleapis.com/v1/projects/{{project}}/triggers/{{trigger_id}}")
@ -395,7 +395,7 @@ func resourceCloudbuildTriggerDelete(d *schema.ResourceData, meta interface{}) e
return nil
}
func resourceCloudbuildTriggerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
func resourceCloudBuildTriggerImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
config := meta.(*Config)
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/triggers/(?P<trigger_id>[^/]+)", "(?P<project>[^/]+)/(?P<trigger_id>[^/]+)", "(?P<trigger_id>[^/]+)"}, d, config); err != nil {
return nil, err
@ -411,39 +411,39 @@ func resourceCloudbuildTriggerImport(d *schema.ResourceData, meta interface{}) (
return []*schema.ResourceData{d}, nil
}
func flattenCloudbuildTriggerTrigger_id(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTrigger_id(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerDescription(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerDescription(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerDisabled(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerDisabled(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerCreateTime(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerCreateTime(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerSubstitutions(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerSubstitutions(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerFilename(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerFilename(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerIgnoredFiles(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerIgnoredFiles(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerIncludedFiles(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerIncludedFiles(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceData) interface{} {
if v == nil {
return nil
}
@ -453,44 +453,44 @@ func flattenCloudbuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceDa
}
transformed := make(map[string]interface{})
transformed["project_id"] =
flattenCloudbuildTriggerTriggerTemplateProjectId(original["projectId"], d)
flattenCloudBuildTriggerTriggerTemplateProjectId(original["projectId"], d)
transformed["repo_name"] =
flattenCloudbuildTriggerTriggerTemplateRepoName(original["repoName"], d)
flattenCloudBuildTriggerTriggerTemplateRepoName(original["repoName"], d)
transformed["dir"] =
flattenCloudbuildTriggerTriggerTemplateDir(original["dir"], d)
flattenCloudBuildTriggerTriggerTemplateDir(original["dir"], d)
transformed["branch_name"] =
flattenCloudbuildTriggerTriggerTemplateBranchName(original["branchName"], d)
flattenCloudBuildTriggerTriggerTemplateBranchName(original["branchName"], d)
transformed["tag_name"] =
flattenCloudbuildTriggerTriggerTemplateTagName(original["tagName"], d)
flattenCloudBuildTriggerTriggerTemplateTagName(original["tagName"], d)
transformed["commit_sha"] =
flattenCloudbuildTriggerTriggerTemplateCommitSha(original["commitSha"], d)
flattenCloudBuildTriggerTriggerTemplateCommitSha(original["commitSha"], d)
return []interface{}{transformed}
}
func flattenCloudbuildTriggerTriggerTemplateProjectId(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplateProjectId(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerTriggerTemplateRepoName(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplateRepoName(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerTriggerTemplateDir(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplateDir(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerTriggerTemplateBranchName(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplateBranchName(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerTriggerTemplateTagName(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplateTagName(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerTriggerTemplateCommitSha(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerTriggerTemplateCommitSha(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerBuild(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerBuild(v interface{}, d *schema.ResourceData) interface{} {
if v == nil {
return nil
}
@ -500,22 +500,22 @@ func flattenCloudbuildTriggerBuild(v interface{}, d *schema.ResourceData) interf
}
transformed := make(map[string]interface{})
transformed["tags"] =
flattenCloudbuildTriggerBuildTags(original["tags"], d)
flattenCloudBuildTriggerBuildTags(original["tags"], d)
transformed["images"] =
flattenCloudbuildTriggerBuildImages(original["images"], d)
flattenCloudBuildTriggerBuildImages(original["images"], d)
transformed["step"] =
flattenCloudbuildTriggerBuildStep(original["steps"], d)
flattenCloudBuildTriggerBuildStep(original["steps"], d)
return []interface{}{transformed}
}
func flattenCloudbuildTriggerBuildTags(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerBuildTags(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerBuildImages(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerBuildImages(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerBuildStep(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerBuildStep(v interface{}, d *schema.ResourceData) interface{} {
if v == nil {
return v
}
@ -528,29 +528,29 @@ func flattenCloudbuildTriggerBuildStep(v interface{}, d *schema.ResourceData) in
continue
}
transformed = append(transformed, map[string]interface{}{
"name": flattenCloudbuildTriggerBuildStepName(original["name"], d),
"args": flattenCloudbuildTriggerBuildStepArgs(original["args"], d),
"name": flattenCloudBuildTriggerBuildStepName(original["name"], d),
"args": flattenCloudBuildTriggerBuildStepArgs(original["args"], d),
})
}
return transformed
}
func flattenCloudbuildTriggerBuildStepName(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerBuildStepName(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenCloudbuildTriggerBuildStepArgs(v interface{}, d *schema.ResourceData) interface{} {
func flattenCloudBuildTriggerBuildStepArgs(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func expandCloudbuildTriggerDescription(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerDescription(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerDisabled(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerDisabled(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerSubstitutions(v interface{}, d *schema.ResourceData, config *Config) (map[string]string, error) {
func expandCloudBuildTriggerSubstitutions(v interface{}, d *schema.ResourceData, config *Config) (map[string]string, error) {
if v == nil {
return map[string]string{}, nil
}
@ -561,19 +561,19 @@ func expandCloudbuildTriggerSubstitutions(v interface{}, d *schema.ResourceData,
return m, nil
}
func expandCloudbuildTriggerFilename(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerFilename(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerIgnoredFiles(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerIgnoredFiles(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerIncludedFiles(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerIncludedFiles(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
return nil, nil
@ -582,42 +582,42 @@ func expandCloudbuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceDat
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedProjectId, err := expandCloudbuildTriggerTriggerTemplateProjectId(original["project_id"], d, config)
transformedProjectId, err := expandCloudBuildTriggerTriggerTemplateProjectId(original["project_id"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedProjectId); val.IsValid() && !isEmptyValue(val) {
transformed["projectId"] = transformedProjectId
}
transformedRepoName, err := expandCloudbuildTriggerTriggerTemplateRepoName(original["repo_name"], d, config)
transformedRepoName, err := expandCloudBuildTriggerTriggerTemplateRepoName(original["repo_name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedRepoName); val.IsValid() && !isEmptyValue(val) {
transformed["repoName"] = transformedRepoName
}
transformedDir, err := expandCloudbuildTriggerTriggerTemplateDir(original["dir"], d, config)
transformedDir, err := expandCloudBuildTriggerTriggerTemplateDir(original["dir"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDir); val.IsValid() && !isEmptyValue(val) {
transformed["dir"] = transformedDir
}
transformedBranchName, err := expandCloudbuildTriggerTriggerTemplateBranchName(original["branch_name"], d, config)
transformedBranchName, err := expandCloudBuildTriggerTriggerTemplateBranchName(original["branch_name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedBranchName); val.IsValid() && !isEmptyValue(val) {
transformed["branchName"] = transformedBranchName
}
transformedTagName, err := expandCloudbuildTriggerTriggerTemplateTagName(original["tag_name"], d, config)
transformedTagName, err := expandCloudBuildTriggerTriggerTemplateTagName(original["tag_name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedTagName); val.IsValid() && !isEmptyValue(val) {
transformed["tagName"] = transformedTagName
}
transformedCommitSha, err := expandCloudbuildTriggerTriggerTemplateCommitSha(original["commit_sha"], d, config)
transformedCommitSha, err := expandCloudBuildTriggerTriggerTemplateCommitSha(original["commit_sha"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedCommitSha); val.IsValid() && !isEmptyValue(val) {
@ -627,31 +627,31 @@ func expandCloudbuildTriggerTriggerTemplate(v interface{}, d *schema.ResourceDat
return transformed, nil
}
func expandCloudbuildTriggerTriggerTemplateProjectId(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplateProjectId(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerTriggerTemplateRepoName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplateRepoName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerTriggerTemplateDir(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplateDir(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerTriggerTemplateBranchName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplateBranchName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerTriggerTemplateTagName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplateTagName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerTriggerTemplateCommitSha(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerTriggerTemplateCommitSha(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerBuild(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerBuild(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
return nil, nil
@ -660,21 +660,21 @@ func expandCloudbuildTriggerBuild(v interface{}, d *schema.ResourceData, config
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTags, err := expandCloudbuildTriggerBuildTags(original["tags"], d, config)
transformedTags, err := expandCloudBuildTriggerBuildTags(original["tags"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedTags); val.IsValid() && !isEmptyValue(val) {
transformed["tags"] = transformedTags
}
transformedImages, err := expandCloudbuildTriggerBuildImages(original["images"], d, config)
transformedImages, err := expandCloudBuildTriggerBuildImages(original["images"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedImages); val.IsValid() && !isEmptyValue(val) {
transformed["images"] = transformedImages
}
transformedStep, err := expandCloudbuildTriggerBuildStep(original["step"], d, config)
transformedStep, err := expandCloudBuildTriggerBuildStep(original["step"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedStep); val.IsValid() && !isEmptyValue(val) {
@ -684,15 +684,15 @@ func expandCloudbuildTriggerBuild(v interface{}, d *schema.ResourceData, config
return transformed, nil
}
func expandCloudbuildTriggerBuildTags(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerBuildTags(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerBuildImages(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerBuildImages(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerBuildStep(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerBuildStep(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
@ -702,14 +702,14 @@ func expandCloudbuildTriggerBuildStep(v interface{}, d *schema.ResourceData, con
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedName, err := expandCloudbuildTriggerBuildStepName(original["name"], d, config)
transformedName, err := expandCloudBuildTriggerBuildStepName(original["name"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedName); val.IsValid() && !isEmptyValue(val) {
transformed["name"] = transformedName
}
transformedArgs, err := expandCloudbuildTriggerBuildStepArgs(original["args"], d, config)
transformedArgs, err := expandCloudBuildTriggerBuildStepArgs(original["args"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedArgs); val.IsValid() && !isEmptyValue(val) {
@ -721,10 +721,10 @@ func expandCloudbuildTriggerBuildStep(v interface{}, d *schema.ResourceData, con
return req, nil
}
func expandCloudbuildTriggerBuildStepName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerBuildStepName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}
func expandCloudbuildTriggerBuildStepArgs(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandCloudBuildTriggerBuildStepArgs(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return v, nil
}

12
google/resource_cloudbuild_trigger_generated_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/hashicorp/terraform/terraform"
)
func TestAccCloudbuildTrigger_cloudbuildTriggerFilenameExample(t *testing.T) {
func TestAccCloudBuildTrigger_cloudbuildTriggerFilenameExample(t *testing.T) {
t.Parallel()
context := map[string]interface{}{
@ -34,10 +34,10 @@ func TestAccCloudbuildTrigger_cloudbuildTriggerFilenameExample(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckCloudbuildTriggerDestroy,
CheckDestroy: testAccCheckCloudBuildTriggerDestroy,
Steps: []resource.TestStep{
{
Config: testAccCloudbuildTrigger_cloudbuildTriggerFilenameExample(context),
Config: testAccCloudBuildTrigger_cloudbuildTriggerFilenameExample(context),
},
{
ResourceName: "google_cloudbuild_trigger.filename-trigger",
@ -48,7 +48,7 @@ func TestAccCloudbuildTrigger_cloudbuildTriggerFilenameExample(t *testing.T) {
})
}
func testAccCloudbuildTrigger_cloudbuildTriggerFilenameExample(context map[string]interface{}) string {
func testAccCloudBuildTrigger_cloudbuildTriggerFilenameExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_cloudbuild_trigger" "filename-trigger" {
trigger_template {
@ -66,7 +66,7 @@ resource "google_cloudbuild_trigger" "filename-trigger" {
`, context)
}
func testAccCheckCloudbuildTriggerDestroy(s *terraform.State) error {
func testAccCheckCloudBuildTriggerDestroy(s *terraform.State) error {
for name, rs := range s.RootModule().Resources {
if rs.Type != "google_cloudbuild_trigger" {
continue
@ -84,7 +84,7 @@ func testAccCheckCloudbuildTriggerDestroy(s *terraform.State) error {
_, err = sendRequest(config, "GET", url, nil)
if err == nil {
return fmt.Errorf("CloudbuildTrigger still exists at %s", url)
return fmt.Errorf("CloudBuildTrigger still exists at %s", url)
}
}

2
google/resource_cloudbuild_trigger_test.go
View File

@ -13,7 +13,7 @@ func TestAccCloudBuildTrigger_basic(t *testing.T) {
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckCloudbuildTriggerDestroy,
CheckDestroy: testAccCheckCloudBuildTriggerDestroy,
Steps: []resource.TestStep{
{
Config: testGoogleCloudBuildTrigger_basic(),

38
google/resource_sourcerepo_repository.go
View File

@ -25,14 +25,14 @@ import (
"github.com/hashicorp/terraform/helper/schema"
)
func resourceSourcerepoRepository() *schema.Resource {
func resourceSourceRepoRepository() *schema.Resource {
return &schema.Resource{
Create: resourceSourcerepoRepositoryCreate,
Read: resourceSourcerepoRepositoryRead,
Delete: resourceSourcerepoRepositoryDelete,
Create: resourceSourceRepoRepositoryCreate,
Read: resourceSourceRepoRepositoryRead,
Delete: resourceSourceRepoRepositoryDelete,
Importer: &schema.ResourceImporter{
State: resourceSourcerepoRepositoryImport,
State: resourceSourceRepoRepositoryImport,
},
Timeouts: &schema.ResourceTimeout{
@ -64,11 +64,11 @@ func resourceSourcerepoRepository() *schema.Resource {
}
}
func resourceSourcerepoRepositoryCreate(d *schema.ResourceData, meta interface{}) error {
func resourceSourceRepoRepositoryCreate(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
obj := make(map[string]interface{})
nameProp, err := expandSourcerepoRepositoryName(d.Get("name"), d, config)
nameProp, err := expandSourceRepoRepositoryName(d.Get("name"), d, config)
if err != nil {
return err
} else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(nameProp)) && (ok || !reflect.DeepEqual(v, nameProp)) {
@ -95,10 +95,10 @@ func resourceSourcerepoRepositoryCreate(d *schema.ResourceData, meta interface{}
log.Printf("[DEBUG] Finished creating Repository %q: %#v", d.Id(), res)
return resourceSourcerepoRepositoryRead(d, meta)
return resourceSourceRepoRepositoryRead(d, meta)
}
func resourceSourcerepoRepositoryRead(d *schema.ResourceData, meta interface{}) error {
func resourceSourceRepoRepositoryRead(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
url, err := replaceVars(d, config, "https://sourcerepo.googleapis.com/v1/projects/{{project}}/repos/{{name}}")
@ -108,7 +108,7 @@ func resourceSourcerepoRepositoryRead(d *schema.ResourceData, meta interface{})
res, err := sendRequest(config, "GET", url, nil)
if err != nil {
return handleNotFoundError(err, d, fmt.Sprintf("SourcerepoRepository %q", d.Id()))
return handleNotFoundError(err, d, fmt.Sprintf("SourceRepoRepository %q", d.Id()))
}
project, err := getProject(d, config)
@ -119,20 +119,20 @@ func resourceSourcerepoRepositoryRead(d *schema.ResourceData, meta interface{})
return fmt.Errorf("Error reading Repository: %s", err)
}
if err := d.Set("name", flattenSourcerepoRepositoryName(res["name"], d)); err != nil {
if err := d.Set("name", flattenSourceRepoRepositoryName(res["name"], d)); err != nil {
return fmt.Errorf("Error reading Repository: %s", err)
}
if err := d.Set("url", flattenSourcerepoRepositoryUrl(res["url"], d)); err != nil {
if err := d.Set("url", flattenSourceRepoRepositoryUrl(res["url"], d)); err != nil {
return fmt.Errorf("Error reading Repository: %s", err)
}
if err := d.Set("size", flattenSourcerepoRepositorySize(res["size"], d)); err != nil {
if err := d.Set("size", flattenSourceRepoRepositorySize(res["size"], d)); err != nil {
return fmt.Errorf("Error reading Repository: %s", err)
}
return nil
}
func resourceSourcerepoRepositoryDelete(d *schema.ResourceData, meta interface{}) error {
func resourceSourceRepoRepositoryDelete(d *schema.ResourceData, meta interface{}) error {
config := meta.(*Config)
url, err := replaceVars(d, config, "https://sourcerepo.googleapis.com/v1/projects/{{project}}/repos/{{name}}")
@ -151,7 +151,7 @@ func resourceSourcerepoRepositoryDelete(d *schema.ResourceData, meta interface{}
return nil
}
func resourceSourcerepoRepositoryImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
func resourceSourceRepoRepositoryImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
config := meta.(*Config)
if err := parseImportId([]string{"projects/(?P<project>[^/]+)/repos/(?P<name>[^/]+)", "(?P<project>[^/]+)/(?P<name>[^/]+)", "(?P<name>[^/]+)"}, d, config); err != nil {
return nil, err
@ -167,7 +167,7 @@ func resourceSourcerepoRepositoryImport(d *schema.ResourceData, meta interface{}
return []*schema.ResourceData{d}, nil
}
func flattenSourcerepoRepositoryName(v interface{}, d *schema.ResourceData) interface{} {
func flattenSourceRepoRepositoryName(v interface{}, d *schema.ResourceData) interface{} {
if v == nil {
return v
}
@ -177,11 +177,11 @@ func flattenSourcerepoRepositoryName(v interface{}, d *schema.ResourceData) inte
return parts[3]
}
func flattenSourcerepoRepositoryUrl(v interface{}, d *schema.ResourceData) interface{} {
func flattenSourceRepoRepositoryUrl(v interface{}, d *schema.ResourceData) interface{} {
return v
}
func flattenSourcerepoRepositorySize(v interface{}, d *schema.ResourceData) interface{} {
func flattenSourceRepoRepositorySize(v interface{}, d *schema.ResourceData) interface{} {
// Handles the string fixed64 format
if strVal, ok := v.(string); ok {
if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil {
@ -191,6 +191,6 @@ func flattenSourcerepoRepositorySize(v interface{}, d *schema.ResourceData) inte
return v
}
func expandSourcerepoRepositoryName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
func expandSourceRepoRepositoryName(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
return replaceVars(d, config, "projects/{{project}}/repos/{{name}}")
}

12
google/resource_sourcerepo_repository_generated_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/hashicorp/terraform/terraform"
)
func TestAccSourcerepoRepository_sourcerepoRepositoryBasicExample(t *testing.T) {
func TestAccSourceRepoRepository_sourcerepoRepositoryBasicExample(t *testing.T) {
t.Parallel()
context := map[string]interface{}{
@ -34,10 +34,10 @@ func TestAccSourcerepoRepository_sourcerepoRepositoryBasicExample(t *testing.T)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckSourcerepoRepositoryDestroy,
CheckDestroy: testAccCheckSourceRepoRepositoryDestroy,
Steps: []resource.TestStep{
{
Config: testAccSourcerepoRepository_sourcerepoRepositoryBasicExample(context),
Config: testAccSourceRepoRepository_sourcerepoRepositoryBasicExample(context),
},
{
ResourceName: "google_sourcerepo_repository.my-repo",
@ -48,7 +48,7 @@ func TestAccSourcerepoRepository_sourcerepoRepositoryBasicExample(t *testing.T)
})
}
func testAccSourcerepoRepository_sourcerepoRepositoryBasicExample(context map[string]interface{}) string {
func testAccSourceRepoRepository_sourcerepoRepositoryBasicExample(context map[string]interface{}) string {
return Nprintf(`
resource "google_sourcerepo_repository" "my-repo" {
name = "my-repository-%{random_suffix}"
@ -56,7 +56,7 @@ resource "google_sourcerepo_repository" "my-repo" {
`, context)
}
func testAccCheckSourcerepoRepositoryDestroy(s *terraform.State) error {
func testAccCheckSourceRepoRepositoryDestroy(s *terraform.State) error {
for name, rs := range s.RootModule().Resources {
if rs.Type != "google_sourcerepo_repository" {
continue
@ -74,7 +74,7 @@ func testAccCheckSourcerepoRepositoryDestroy(s *terraform.State) error {
_, err = sendRequest(config, "GET", url, nil)
if err == nil {
return fmt.Errorf("SourcerepoRepository still exists at %s", url)
return fmt.Errorf("SourceRepoRepository still exists at %s", url)
}
}

4
google/resource_sourcerepo_repository_test.go
View File

@ -8,14 +8,14 @@ import (
"github.com/hashicorp/terraform/helper/resource"
)
func TestAccSourcerepoRepository_basic(t *testing.T) {
func TestAccSourceRepoRepository_basic(t *testing.T) {
t.Parallel()
repositoryName := fmt.Sprintf("source-repo-repository-test-%s", acctest.RandString(10))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckSourcerepoRepositoryDestroy,
CheckDestroy: testAccCheckSourceRepoRepositoryDestroy,
Steps: []resource.TestStep{
{
Config: testAccSourceRepoRepository_basic(repositoryName),