mirror of
https://github.com/letic/terraform-provider-google.git
synced 2024-09-07 01:26:43 +00:00
Merge branch 'master' into rileykarson-patch-4
This commit is contained in:
commit
eb1ce4a6e2
@ -586,11 +586,11 @@ func resourceCloudFunctionsDestroy(d *schema.ResourceData, meta interface{}) err
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandEventTrigger(configured []interface{}, project string) *cloudfunctions.EventTrigger {
|
func expandEventTrigger(configured []interface{}, project string) *cloudfunctions.EventTrigger {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
if data, ok := configured[0].(map[string]interface{}); ok {
|
data := configured[0].(map[string]interface{})
|
||||||
eventType := data["event_type"].(string)
|
eventType := data["event_type"].(string)
|
||||||
shape := ""
|
shape := ""
|
||||||
switch {
|
switch {
|
||||||
@ -607,9 +607,6 @@ func expandEventTrigger(configured []interface{}, project string) *cloudfunction
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func flattenEventTrigger(eventTrigger *cloudfunctions.EventTrigger) []map[string]interface{} {
|
func flattenEventTrigger(eventTrigger *cloudfunctions.EventTrigger) []map[string]interface{} {
|
||||||
result := make([]map[string]interface{}, 0, 1)
|
result := make([]map[string]interface{}, 0, 1)
|
||||||
if eventTrigger == nil {
|
if eventTrigger == nil {
|
||||||
@ -626,11 +623,11 @@ func flattenEventTrigger(eventTrigger *cloudfunctions.EventTrigger) []map[string
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandFailurePolicy(configured []interface{}) *cloudfunctions.FailurePolicy {
|
func expandFailurePolicy(configured []interface{}) *cloudfunctions.FailurePolicy {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return &cloudfunctions.FailurePolicy{}
|
return &cloudfunctions.FailurePolicy{}
|
||||||
}
|
}
|
||||||
|
|
||||||
if data, ok := configured[0].(map[string]interface{}); ok && data["retry"].(bool) {
|
if data := configured[0].(map[string]interface{}); data["retry"].(bool) {
|
||||||
return &cloudfunctions.FailurePolicy{
|
return &cloudfunctions.FailurePolicy{
|
||||||
Retry: &cloudfunctions.Retry{},
|
Retry: &cloudfunctions.Retry{},
|
||||||
}
|
}
|
||||||
|
@ -399,10 +399,11 @@ func resourceComputeBackendServiceDelete(d *schema.ResourceData, meta interface{
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandIap(configured []interface{}) *computeBeta.BackendServiceIAP {
|
func expandIap(configured []interface{}) *computeBeta.BackendServiceIAP {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
if data, ok := configured[0].(map[string]interface{}); ok {
|
|
||||||
|
data := configured[0].(map[string]interface{})
|
||||||
return &computeBeta.BackendServiceIAP{
|
return &computeBeta.BackendServiceIAP{
|
||||||
Enabled: true,
|
Enabled: true,
|
||||||
Oauth2ClientId: data["oauth2_client_id"].(string),
|
Oauth2ClientId: data["oauth2_client_id"].(string),
|
||||||
@ -411,9 +412,6 @@ func expandIap(configured []interface{}) *computeBeta.BackendServiceIAP {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func flattenIap(iap *computeBeta.BackendServiceIAP) []map[string]interface{} {
|
func flattenIap(iap *computeBeta.BackendServiceIAP) []map[string]interface{} {
|
||||||
result := make([]map[string]interface{}, 0, 1)
|
result := make([]map[string]interface{}, 0, 1)
|
||||||
if iap == nil || !iap.Enabled {
|
if iap == nil || !iap.Enabled {
|
||||||
@ -591,11 +589,11 @@ func expandBackendService(d *schema.ResourceData) (*computeBeta.BackendService,
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandCdnPolicy(configured []interface{}) *computeBeta.BackendServiceCdnPolicy {
|
func expandCdnPolicy(configured []interface{}) *computeBeta.BackendServiceCdnPolicy {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
data := configured[0].(map[string]interface{})
|
|
||||||
|
|
||||||
|
data := configured[0].(map[string]interface{})
|
||||||
ckp := data["cache_key_policy"].([]interface{})
|
ckp := data["cache_key_policy"].([]interface{})
|
||||||
if len(ckp) == 0 {
|
if len(ckp) == 0 {
|
||||||
return nil
|
return nil
|
||||||
|
@ -317,9 +317,10 @@ func expandSecurityPolicyRule(raw interface{}) *compute.SecurityPolicyRule {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandSecurityPolicyMatch(configured []interface{}) *compute.SecurityPolicyRuleMatcher {
|
func expandSecurityPolicyMatch(configured []interface{}) *compute.SecurityPolicyRuleMatcher {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
data := configured[0].(map[string]interface{})
|
data := configured[0].(map[string]interface{})
|
||||||
return &compute.SecurityPolicyRuleMatcher{
|
return &compute.SecurityPolicyRuleMatcher{
|
||||||
VersionedExpr: data["versioned_expr"].(string),
|
VersionedExpr: data["versioned_expr"].(string),
|
||||||
@ -328,9 +329,10 @@ func expandSecurityPolicyMatch(configured []interface{}) *compute.SecurityPolicy
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandSecurityPolicyMatchConfig(configured []interface{}) *compute.SecurityPolicyRuleMatcherConfig {
|
func expandSecurityPolicyMatchConfig(configured []interface{}) *compute.SecurityPolicyRuleMatcherConfig {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
data := configured[0].(map[string]interface{})
|
data := configured[0].(map[string]interface{})
|
||||||
return &compute.SecurityPolicyRuleMatcherConfig{
|
return &compute.SecurityPolicyRuleMatcherConfig{
|
||||||
SrcIpRanges: convertStringArr(data["src_ip_ranges"].(*schema.Set).List()),
|
SrcIpRanges: convertStringArr(data["src_ip_ranges"].(*schema.Set).List()),
|
||||||
|
@ -1363,9 +1363,10 @@ func getInstanceGroupUrlsFromManagerUrls(config *Config, igmUrls []string) ([]st
|
|||||||
|
|
||||||
func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConfig {
|
func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConfig {
|
||||||
l := configured.([]interface{})
|
l := configured.([]interface{})
|
||||||
if len(l) == 0 {
|
if len(l) == 0 || l[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
config := l[0].(map[string]interface{})
|
config := l[0].(map[string]interface{})
|
||||||
ac := &containerBeta.AddonsConfig{}
|
ac := &containerBeta.AddonsConfig{}
|
||||||
|
|
||||||
@ -1406,9 +1407,10 @@ func expandClusterAddonsConfig(configured interface{}) *containerBeta.AddonsConf
|
|||||||
|
|
||||||
func expandIPAllocationPolicy(configured interface{}) *containerBeta.IPAllocationPolicy {
|
func expandIPAllocationPolicy(configured interface{}) *containerBeta.IPAllocationPolicy {
|
||||||
l := configured.([]interface{})
|
l := configured.([]interface{})
|
||||||
if len(l) == 0 {
|
if len(l) == 0 || l[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
config := l[0].(map[string]interface{})
|
config := l[0].(map[string]interface{})
|
||||||
|
|
||||||
return &containerBeta.IPAllocationPolicy{
|
return &containerBeta.IPAllocationPolicy{
|
||||||
@ -1427,9 +1429,10 @@ func expandIPAllocationPolicy(configured interface{}) *containerBeta.IPAllocatio
|
|||||||
|
|
||||||
func expandMaintenancePolicy(configured interface{}) *containerBeta.MaintenancePolicy {
|
func expandMaintenancePolicy(configured interface{}) *containerBeta.MaintenancePolicy {
|
||||||
l := configured.([]interface{})
|
l := configured.([]interface{})
|
||||||
if len(l) == 0 {
|
if len(l) == 0 || l[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
maintenancePolicy := l[0].(map[string]interface{})
|
maintenancePolicy := l[0].(map[string]interface{})
|
||||||
dailyMaintenanceWindow := maintenancePolicy["daily_maintenance_window"].([]interface{})[0].(map[string]interface{})
|
dailyMaintenanceWindow := maintenancePolicy["daily_maintenance_window"].([]interface{})[0].(map[string]interface{})
|
||||||
startTime := dailyMaintenanceWindow["start_time"].(string)
|
startTime := dailyMaintenanceWindow["start_time"].(string)
|
||||||
@ -1444,9 +1447,10 @@ func expandMaintenancePolicy(configured interface{}) *containerBeta.MaintenanceP
|
|||||||
|
|
||||||
func expandMasterAuth(configured interface{}) *containerBeta.MasterAuth {
|
func expandMasterAuth(configured interface{}) *containerBeta.MasterAuth {
|
||||||
l := configured.([]interface{})
|
l := configured.([]interface{})
|
||||||
if len(l) == 0 {
|
if len(l) == 0 || l[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
masterAuth := l[0].(map[string]interface{})
|
masterAuth := l[0].(map[string]interface{})
|
||||||
result := &containerBeta.MasterAuth{
|
result := &containerBeta.MasterAuth{
|
||||||
Username: masterAuth["username"].(string),
|
Username: masterAuth["username"].(string),
|
||||||
@ -1507,9 +1511,10 @@ func expandNetworkPolicy(configured interface{}) *containerBeta.NetworkPolicy {
|
|||||||
|
|
||||||
func expandPodSecurityPolicyConfig(configured interface{}) *containerBeta.PodSecurityPolicyConfig {
|
func expandPodSecurityPolicyConfig(configured interface{}) *containerBeta.PodSecurityPolicyConfig {
|
||||||
l := configured.([]interface{})
|
l := configured.([]interface{})
|
||||||
if len(l) == 0 {
|
if len(l) == 0 || l[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
config := l[0].(map[string]interface{})
|
config := l[0].(map[string]interface{})
|
||||||
return &containerBeta.PodSecurityPolicyConfig{
|
return &containerBeta.PodSecurityPolicyConfig{
|
||||||
Enabled: config["enabled"].(bool),
|
Enabled: config["enabled"].(bool),
|
||||||
|
@ -263,7 +263,7 @@ func flattenRestoreOrganizationPolicy(restore_policy *cloudresourcemanager.Resto
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandBooleanOrganizationPolicy(configured []interface{}) *cloudresourcemanager.BooleanPolicy {
|
func expandBooleanOrganizationPolicy(configured []interface{}) *cloudresourcemanager.BooleanPolicy {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -274,7 +274,7 @@ func expandBooleanOrganizationPolicy(configured []interface{}) *cloudresourceman
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandRestoreOrganizationPolicy(configured []interface{}) (*cloudresourcemanager.RestoreDefault, error) {
|
func expandRestoreOrganizationPolicy(configured []interface{}) (*cloudresourcemanager.RestoreDefault, error) {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -321,7 +321,7 @@ func flattenListOrganizationPolicy(policy *cloudresourcemanager.ListPolicy) []ma
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandListOrganizationPolicy(configured []interface{}) (*cloudresourcemanager.ListPolicy, error) {
|
func expandListOrganizationPolicy(configured []interface{}) (*cloudresourcemanager.ListPolicy, error) {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -214,7 +214,7 @@ func flattenPubsubSubscriptionPushConfig(pushConfig *pubsub.PushConfig) []map[st
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandPubsubSubscriptionPushConfig(configured []interface{}) *pubsub.PushConfig {
|
func expandPubsubSubscriptionPushConfig(configured []interface{}) *pubsub.PushConfig {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
// An empty `pushConfig` indicates that the Pub/Sub system should stop pushing messages
|
// An empty `pushConfig` indicates that the Pub/Sub system should stop pushing messages
|
||||||
// from the given subscription and allow messages to be pulled and acknowledged.
|
// from the given subscription and allow messages to be pulled and acknowledged.
|
||||||
return &pubsub.PushConfig{}
|
return &pubsub.PushConfig{}
|
||||||
|
@ -522,7 +522,7 @@ func resourceSqlDatabaseInstanceCreate(d *schema.ResourceData, meta interface{})
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandSqlDatabaseInstanceSettings(configured []interface{}, secondGen bool) *sqladmin.Settings {
|
func expandSqlDatabaseInstanceSettings(configured []interface{}, secondGen bool) *sqladmin.Settings {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -556,7 +556,7 @@ func expandSqlDatabaseInstanceSettings(configured []interface{}, secondGen bool)
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandReplicaConfiguration(configured []interface{}) *sqladmin.ReplicaConfiguration {
|
func expandReplicaConfiguration(configured []interface{}) *sqladmin.ReplicaConfiguration {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -582,7 +582,7 @@ func expandReplicaConfiguration(configured []interface{}) *sqladmin.ReplicaConfi
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandMaintenanceWindow(configured []interface{}) *sqladmin.MaintenanceWindow {
|
func expandMaintenanceWindow(configured []interface{}) *sqladmin.MaintenanceWindow {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -595,7 +595,7 @@ func expandMaintenanceWindow(configured []interface{}) *sqladmin.MaintenanceWind
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandLocationPreference(configured []interface{}) *sqladmin.LocationPreference {
|
func expandLocationPreference(configured []interface{}) *sqladmin.LocationPreference {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -607,7 +607,7 @@ func expandLocationPreference(configured []interface{}) *sqladmin.LocationPrefer
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandIpConfiguration(configured []interface{}) *sqladmin.IpConfiguration {
|
func expandIpConfiguration(configured []interface{}) *sqladmin.IpConfiguration {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -654,7 +654,7 @@ func expandDatabaseFlags(configured []interface{}) []*sqladmin.DatabaseFlags {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func expandBackupConfiguration(configured []interface{}) *sqladmin.BackupConfiguration {
|
func expandBackupConfiguration(configured []interface{}) *sqladmin.BackupConfiguration {
|
||||||
if len(configured) == 0 {
|
if len(configured) == 0 || configured[0] == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user