Skip to content

Commit

Permalink
Add serverless negs (#3807)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician committed Aug 6, 2020
1 parent fd9dab7 commit d0fde64
Show file tree
Hide file tree
Showing 10 changed files with 42 additions and 11 deletions.
3 changes: 3 additions & 0 deletions .changelog/3807.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
`google_compute_region_network_endpoint_group` (supports serverless NEGs)
```
6 changes: 4 additions & 2 deletions google/resource_access_context_manager_access_level.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ allowed.`,
Description: `A list of allowed device management levels.
An empty list allows all management levels. Possible values: ["MANAGEMENT_UNSPECIFIED", "NONE", "BASIC", "COMPLETE"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"MANAGEMENT_UNSPECIFIED", "NONE", "BASIC", "COMPLETE"}, false),
},
},
"allowed_encryption_statuses": {
Expand All @@ -101,7 +102,8 @@ An empty list allows all management levels. Possible values: ["MANAGEMENT_UNSPEC
Description: `A list of allowed encryptions statuses.
An empty list allows all statuses. Possible values: ["ENCRYPTION_UNSPECIFIED", "ENCRYPTION_UNSUPPORTED", "UNENCRYPTED", "ENCRYPTED"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"ENCRYPTION_UNSPECIFIED", "ENCRYPTION_UNSUPPORTED", "UNENCRYPTED", "ENCRYPTED"}, false),
},
},
"os_constraints": {
Expand Down
5 changes: 3 additions & 2 deletions google/resource_app_engine_flexible_app_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -649,9 +649,10 @@ All URLs that begin with this prefix are handled by this handler, using the port
"inbound_services": {
Type: schema.TypeSet,
Optional: true,
Description: `Before an application can receive email or XMPP messages, the application must be configured to enable the service.`,
Description: `A list of the types of messages that this application is able to receive. Possible values: ["INBOUND_SERVICE_MAIL", "INBOUND_SERVICE_MAIL_BOUNCE", "INBOUND_SERVICE_XMPP_ERROR", "INBOUND_SERVICE_XMPP_MESSAGE", "INBOUND_SERVICE_XMPP_SUBSCRIBE", "INBOUND_SERVICE_XMPP_PRESENCE", "INBOUND_SERVICE_CHANNEL_PRESENCE", "INBOUND_SERVICE_WARMUP"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"INBOUND_SERVICE_MAIL", "INBOUND_SERVICE_MAIL_BOUNCE", "INBOUND_SERVICE_XMPP_ERROR", "INBOUND_SERVICE_XMPP_MESSAGE", "INBOUND_SERVICE_XMPP_SUBSCRIBE", "INBOUND_SERVICE_XMPP_PRESENCE", "INBOUND_SERVICE_CHANNEL_PRESENCE", "INBOUND_SERVICE_WARMUP"}, false),
},
Set: schema.HashString,
},
Expand Down
5 changes: 3 additions & 2 deletions google/resource_app_engine_standard_app_version.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,10 @@ All URLs that begin with this prefix are handled by this handler, using the port
"inbound_services": {
Type: schema.TypeSet,
Optional: true,
Description: `Before an application can receive email or XMPP messages, the application must be configured to enable the service.`,
Description: `A list of the types of messages that this application is able to receive. Possible values: ["INBOUND_SERVICE_MAIL", "INBOUND_SERVICE_MAIL_BOUNCE", "INBOUND_SERVICE_XMPP_ERROR", "INBOUND_SERVICE_XMPP_MESSAGE", "INBOUND_SERVICE_XMPP_SUBSCRIBE", "INBOUND_SERVICE_XMPP_PRESENCE", "INBOUND_SERVICE_CHANNEL_PRESENCE", "INBOUND_SERVICE_WARMUP"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"INBOUND_SERVICE_MAIL", "INBOUND_SERVICE_MAIL_BOUNCE", "INBOUND_SERVICE_XMPP_ERROR", "INBOUND_SERVICE_XMPP_MESSAGE", "INBOUND_SERVICE_XMPP_SUBSCRIBE", "INBOUND_SERVICE_XMPP_PRESENCE", "INBOUND_SERVICE_CHANNEL_PRESENCE", "INBOUND_SERVICE_WARMUP"}, false),
},
Set: schema.HashString,
},
Expand Down
19 changes: 19 additions & 0 deletions google/resource_container_cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -902,6 +902,25 @@ func resourceContainerCluster() *schema.Resource {
},
},

"release_channel": {
Type: schema.TypeList,
Optional: true,
Computed: true,
MaxItems: 1,
Description: `Configuration options for the Release channel feature, which provide more control over automatic upgrades of your GKE clusters.`,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"channel": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{"UNSPECIFIED", "RAPID", "REGULAR", "STABLE"}, false),
DiffSuppressFunc: emptyOrDefaultStringSuppress("UNSPECIFIED"),
Description: `The selected release channel.`,
},
},
},
},

"enable_intranode_visibility": {
Type: schema.TypeBool,
Optional: true,
Expand Down
3 changes: 2 additions & 1 deletion google/resource_dialogflow_intent.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ Note: The action name must not contain whitespaces.`,
Description: `The list of platforms for which the first responses will be copied from the messages in PLATFORM_UNSPECIFIED
(i.e. default platform). Possible values: ["FACEBOOK", "SLACK", "TELEGRAM", "KIK", "SKYPE", "LINE", "VIBER", "ACTIONS_ON_GOOGLE", "GOOGLE_HANGOUTS"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"FACEBOOK", "SLACK", "TELEGRAM", "KIK", "SKYPE", "LINE", "VIBER", "ACTIONS_ON_GOOGLE", "GOOGLE_HANGOUTS"}, false),
},
},
"events": {
Expand Down
3 changes: 2 additions & 1 deletion google/resource_filestore_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ only a single network is supported.`,
Description: `IP versions for which the instance has
IP addresses assigned. Possible values: ["ADDRESS_MODE_UNSPECIFIED", "MODE_IPV4", "MODE_IPV6"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"ADDRESS_MODE_UNSPECIFIED", "MODE_IPV4", "MODE_IPV6"}, false),
},
},
"network": {
Expand Down
3 changes: 2 additions & 1 deletion google/resource_os_config_patch_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,8 @@ be executed directly, which will likely only succeed for scripts with shebang li
ForceNew: true,
Description: `Only apply updates of these windows update classifications. If empty, all updates are applied. Possible values: ["CRITICAL", "SECURITY", "DEFINITION", "DRIVER", "FEATURE_PACK", "SERVICE_PACK", "TOOL", "UPDATE_ROLLUP", "UPDATE"]`,
Elem: &schema.Schema{
Type: schema.TypeString,
Type: schema.TypeString,
ValidateFunc: validation.StringInSlice([]string{"CRITICAL", "SECURITY", "DEFINITION", "DRIVER", "FEATURE_PACK", "SERVICE_PACK", "TOOL", "UPDATE_ROLLUP", "UPDATE"}, false),
},
ExactlyOneOf: []string{},
},
Expand Down
3 changes: 2 additions & 1 deletion website/docs/r/app_engine_flexible_app_version.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ The `liveness_check` block supports:

* `inbound_services` -
(Optional)
Before an application can receive email or XMPP messages, the application must be configured to enable the service.
A list of the types of messages that this application is able to receive.
Each value may be one of `INBOUND_SERVICE_MAIL`, `INBOUND_SERVICE_MAIL_BOUNCE`, `INBOUND_SERVICE_XMPP_ERROR`, `INBOUND_SERVICE_XMPP_MESSAGE`, `INBOUND_SERVICE_XMPP_SUBSCRIBE`, `INBOUND_SERVICE_XMPP_PRESENCE`, `INBOUND_SERVICE_CHANNEL_PRESENCE`, and `INBOUND_SERVICE_WARMUP`.

* `instance_class` -
(Optional)
Expand Down
3 changes: 2 additions & 1 deletion website/docs/r/app_engine_standard_app_version.html.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,8 @@ The `files` block supports:

* `inbound_services` -
(Optional)
Before an application can receive email or XMPP messages, the application must be configured to enable the service.
A list of the types of messages that this application is able to receive.
Each value may be one of `INBOUND_SERVICE_MAIL`, `INBOUND_SERVICE_MAIL_BOUNCE`, `INBOUND_SERVICE_XMPP_ERROR`, `INBOUND_SERVICE_XMPP_MESSAGE`, `INBOUND_SERVICE_XMPP_SUBSCRIBE`, `INBOUND_SERVICE_XMPP_PRESENCE`, `INBOUND_SERVICE_CHANNEL_PRESENCE`, and `INBOUND_SERVICE_WARMUP`.

* `instance_class` -
(Optional)
Expand Down

0 comments on commit d0fde64

Please sign in to comment.