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

Shuffle schema in BackendService around to match what MM will do #3340

Merged
merged 1 commit into from
Mar 29, 2019
Merged

Shuffle schema in BackendService around to match what MM will do #3340

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
162 changes: 83 additions & 79 deletions google/resource_compute_backend_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,78 +38,16 @@ func resourceComputeBackendService() *schema.Resource {
MaxItems: 1,
},

"iap": {
Type: schema.TypeList,
"affinity_cookie_ttl_sec": {
Type: schema.TypeInt,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"oauth2_client_id": {
Type: schema.TypeString,
Required: true,
},
"oauth2_client_secret": {
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"oauth2_client_secret_sha256": {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
},
},
},

"backend": {
Type: schema.TypeSet,
Optional: true,
Set: resourceGoogleComputeBackendServiceBackendHash,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"group": {
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: compareSelfLinkRelativePaths,
},
"balancing_mode": {
Type: schema.TypeString,
Optional: true,
Default: "UTILIZATION",
},
"capacity_scaler": {
Type: schema.TypeFloat,
Optional: true,
Default: 1,
},
"description": {
Type: schema.TypeString,
Optional: true,
},
"max_rate": {
Type: schema.TypeInt,
Optional: true,
},
"max_rate_per_instance": {
Type: schema.TypeFloat,
Optional: true,
},
"max_connections": {
Type: schema.TypeInt,
Optional: true,
},
"max_connections_per_instance": {
Type: schema.TypeInt,
Optional: true,
},
"max_utilization": {
Type: schema.TypeFloat,
Optional: true,
Default: 0.8,
},
},
},
Elem: computeBackendServiceBackendSchema(),
},

"cdn_policy": {
Expand Down Expand Up @@ -156,6 +94,12 @@ func resourceComputeBackendService() *schema.Resource {
},
},

"connection_draining_timeout_sec": {
Type: schema.TypeInt,
Optional: true,
Default: 300,
},

"custom_request_headers": {
Removed: "This field is in beta. Use it in the the google-beta provider instead. See https://terraform.io/docs/providers/google/provider_versions.html for more details.",
Type: schema.TypeSet,
Expand All @@ -180,17 +124,34 @@ func resourceComputeBackendService() *schema.Resource {
Computed: true,
},

"port_name": {
Type: schema.TypeString,
"iap": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"oauth2_client_id": {
Type: schema.TypeString,
Required: true,
},
"oauth2_client_secret": {
Type: schema.TypeString,
Required: true,
Sensitive: true,
},
"oauth2_client_secret_sha256": {
Type: schema.TypeString,
Computed: true,
Sensitive: true,
},
},
},
},

"project": {
"port_name": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
},

"protocol": {
Expand All @@ -212,32 +173,75 @@ func resourceComputeBackendService() *schema.Resource {
DiffSuppressFunc: compareSelfLinkOrResourceName,
},

"self_link": {
"session_affinity": {
Type: schema.TypeString,
Optional: true,
Computed: true,
},

"session_affinity": {
"timeout_sec": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
},

"project": {
Type: schema.TypeString,
Optional: true,
Computed: true,
ForceNew: true,
},

"affinity_cookie_ttl_sec": {
"self_link": {
Type: schema.TypeString,
Computed: true,
},
},
}
}

func computeBackendServiceBackendSchema() *schema.Resource {
return &schema.Resource{
Schema: map[string]*schema.Schema{
"group": {
Type: schema.TypeString,
Optional: true,
DiffSuppressFunc: compareSelfLinkRelativePaths,
},
"balancing_mode": {
Type: schema.TypeString,
Optional: true,
Default: "UTILIZATION",
},
"capacity_scaler": {
Type: schema.TypeFloat,
Optional: true,
Default: 1,
},
"description": {
Type: schema.TypeString,
Optional: true,
},
"max_rate": {
Type: schema.TypeInt,
Optional: true,
},

"timeout_sec": {
"max_rate_per_instance": {
Type: schema.TypeFloat,
Optional: true,
},
"max_connections": {
Type: schema.TypeInt,
Optional: true,
Computed: true,
},

"connection_draining_timeout_sec": {
"max_connections_per_instance": {
Type: schema.TypeInt,
Optional: true,
Default: 300,
},
"max_utilization": {
Type: schema.TypeFloat,
Optional: true,
Default: 0.8,
},
},
}
Expand Down