Skip to content
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

Removing "input=true" from ignoredFiles and includedFiles #349

Merged
merged 1 commit into from
Jan 15, 2019
Merged

Removing "input=true" from ignoredFiles and includedFiles #349

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
2 changes: 1 addition & 1 deletion google-beta/access_context_manager_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package google

import (
"google.golang.org/api/accesscontextmanager/v1beta"
accesscontextmanager "google.golang.org/api/accesscontextmanager/v1beta"
)

type AccessContextManagerOperationWaiter struct {
Expand Down
16 changes: 8 additions & 8 deletions google-beta/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"golang.org/x/oauth2"
googleoauth "golang.org/x/oauth2/google"
"google.golang.org/api/accesscontextmanager/v1beta"
accesscontextmanager "google.golang.org/api/accesscontextmanager/v1beta"
appengine "google.golang.org/api/appengine/v1"
"google.golang.org/api/bigquery/v2"
"google.golang.org/api/cloudbilling/v1"
Expand All @@ -23,27 +23,27 @@ import (
"google.golang.org/api/cloudkms/v1"
"google.golang.org/api/cloudresourcemanager/v1"
resourceManagerV2Beta1 "google.golang.org/api/cloudresourcemanager/v2beta1"
"google.golang.org/api/composer/v1beta1"
composer "google.golang.org/api/composer/v1beta1"
computeBeta "google.golang.org/api/compute/v0.beta"
"google.golang.org/api/compute/v1"
"google.golang.org/api/container/v1"
containerBeta "google.golang.org/api/container/v1beta1"
"google.golang.org/api/dataflow/v1b3"
dataflow "google.golang.org/api/dataflow/v1b3"
"google.golang.org/api/dataproc/v1"
"google.golang.org/api/dns/v1"
dnsBeta "google.golang.org/api/dns/v1beta2"
file "google.golang.org/api/file/v1beta1"
"google.golang.org/api/iam/v1"
cloudlogging "google.golang.org/api/logging/v2"
"google.golang.org/api/pubsub/v1"
"google.golang.org/api/redis/v1beta1"
"google.golang.org/api/runtimeconfig/v1beta1"
redis "google.golang.org/api/redis/v1beta1"
runtimeconfig "google.golang.org/api/runtimeconfig/v1beta1"
"google.golang.org/api/servicemanagement/v1"
"google.golang.org/api/servicenetworking/v1beta"
"google.golang.org/api/serviceusage/v1beta1"
servicenetworking "google.golang.org/api/servicenetworking/v1beta"
serviceusage "google.golang.org/api/serviceusage/v1beta1"
"google.golang.org/api/sourcerepo/v1"
"google.golang.org/api/spanner/v1"
"google.golang.org/api/sqladmin/v1beta4"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
"google.golang.org/api/storage/v1"
"google.golang.org/api/storagetransfer/v1"
)
Expand Down
14 changes: 12 additions & 2 deletions google-beta/resource_cloudbuild_trigger.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,13 @@ func resourceCloudBuildTrigger() *schema.Resource {
"ignored_files": {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"included_files": {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
Expand Down Expand Up @@ -347,6 +345,18 @@ func resourceCloudBuildTriggerUpdate(d *schema.ResourceData, meta interface{}) e
} else if v, ok := d.GetOkExists("filename"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, filenameProp)) {
obj["filename"] = filenameProp
}
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(v)) && (ok || !reflect.DeepEqual(v, ignoredFilesProp)) {
obj["ignoredFiles"] = ignoredFilesProp
}
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(v)) && (ok || !reflect.DeepEqual(v, includedFilesProp)) {
obj["includedFiles"] = includedFilesProp
}
triggerTemplateProp, err := expandCloudBuildTriggerTriggerTemplate(d.Get("trigger_template"), d, config)
if err != nil {
return err
Expand Down
4 changes: 2 additions & 2 deletions google-beta/resource_composer_environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"strings"
"time"

"github.com/hashicorp/go-version"
version "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"google.golang.org/api/composer/v1beta1"
composer "google.golang.org/api/composer/v1beta1"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions google-beta/resource_composer_environment_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"strings"
"time"

"github.com/hashicorp/go-multierror"
multierror "github.com/hashicorp/go-multierror"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"
"google.golang.org/api/composer/v1beta1"
composer "google.golang.org/api/composer/v1beta1"
"google.golang.org/api/storage/v1"
)

Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeAddress() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_autoscaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeAutoscaler() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_backend_bucket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeBackendBucket() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (

"github.com/hashicorp/terraform/helper/customdiff"
"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
)

Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/hashicorp/terraform/helper/hashcode"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeFirewallRuleHash(v interface{}) int {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_forwarding_rule.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeForwardingRule() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_global_address.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeGlobalAddress() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_health_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeHealthCheck() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_http_health_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeHttpHealthCheck() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_https_health_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeHttpsHealthCheck() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeImage() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_interconnect_attachment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeInterconnectAttachment() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_region_autoscaler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeRegionAutoscaler() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_region_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (

"github.com/hashicorp/terraform/helper/customdiff"
"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
"google.golang.org/api/googleapi"
)

Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeRoute() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_router.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeRouter() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_snapshot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeSnapshot() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_ssl_certificate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeSslCertificate() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_ssl_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func sslPolicyCustomizeDiff(diff *schema.ResourceDiff, v interface{}) error {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_subnetwork.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"github.com/apparentlymart/go-cidr/cidr"
"github.com/hashicorp/terraform/helper/customdiff"
"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

// Whether the IP CIDR change shrinks the block.
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_target_http_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeTargetHttpProxy() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_target_https_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeTargetHttpsProxy() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_target_ssl_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeTargetSslProxy() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_target_tcp_proxy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeTargetTcpProxy() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_url_map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeUrlMap() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_vpn_gateway.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

func resourceComputeVpnGateway() *schema.Resource {
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_compute_vpn_tunnel.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
"time"

"github.com/hashicorp/terraform/helper/schema"
compute "google.golang.org/api/compute/v1"
"google.golang.org/api/compute/v1"
)

// validatePeerAddr returns false if a tunnel's peer_ip property
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_container_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/hashicorp/errwrap"
"github.com/hashicorp/go-version"
version "github.com/hashicorp/go-version"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
Expand Down
2 changes: 1 addition & 1 deletion google-beta/resource_service_networking_connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strings"

"github.com/hashicorp/terraform/helper/schema"
"google.golang.org/api/servicenetworking/v1beta"
servicenetworking "google.golang.org/api/servicenetworking/v1beta"
)

func resourceServiceNetworkingConnection() *schema.Resource {
Expand Down
3 changes: 1 addition & 2 deletions google-beta/resource_sql_database_instance_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import (
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"

"google.golang.org/api/sqladmin/v1beta4"
sqladmin "google.golang.org/api/sqladmin/v1beta4"
)

// Fields that should be ignored in import tests because they aren't returned
Expand Down
2 changes: 1 addition & 1 deletion google-beta/service_networking_operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package google

import (
"google.golang.org/api/servicenetworking/v1beta"
servicenetworking "google.golang.org/api/servicenetworking/v1beta"
)

type ServiceNetworkingOperationWaiter struct {
Expand Down