Deprecate handwritten beta fields.

This commit is contained in:
Riley Karson 2018-10-02 14:13:04 -07:00
parent 27bd76d9d4
commit a8747b4909
8 changed files with 72 additions and 53 deletions

View File

@ -20,6 +20,7 @@ func dataSourceGoogleContainerEngineVersions() *schema.Resource {
Optional: true, Optional: true,
}, },
"region": { "region": {
Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ConflictsWith: []string{"zone"}, ConflictsWith: []string{"zone"},

View File

@ -12,23 +12,26 @@ import (
var IamComputeSubnetworkSchema = map[string]*schema.Schema{ var IamComputeSubnetworkSchema = map[string]*schema.Schema{
"subnetwork": { "subnetwork": {
Type: schema.TypeString, Deprecated: "This resource is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Required: true, Type: schema.TypeString,
ForceNew: true, Required: true,
ForceNew: true,
}, },
"project": { "project": {
Type: schema.TypeString, Deprecated: "This resource is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeString,
Computed: true, Optional: true,
ForceNew: true, Computed: true,
ForceNew: true,
}, },
"region": { "region": {
Type: schema.TypeString, Deprecated: "This resource is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeString,
Computed: true, Optional: true,
ForceNew: true, Computed: true,
ForceNew: true,
}, },
} }

View File

@ -142,6 +142,7 @@ var schemaNodeConfig = &schema.Schema{
}, },
"taint": { "taint": {
Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Type: schema.TypeList, Type: schema.TypeList,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,
@ -169,10 +170,11 @@ var schemaNodeConfig = &schema.Schema{
}, },
"workload_metadata_config": { "workload_metadata_config": {
Type: schema.TypeList, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeList,
ForceNew: true, Optional: true,
MaxItems: 1, ForceNew: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"node_metadata": { "node_metadata": {

View File

@ -159,10 +159,11 @@ func resourceComputeBackendService() *schema.Resource {
}, },
"custom_request_headers": &schema.Schema{ "custom_request_headers": &schema.Schema{
Type: schema.TypeSet, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeSet,
Elem: &schema.Schema{Type: schema.TypeString}, Optional: true,
Set: schema.HashString, Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
}, },
"description": &schema.Schema{ "description": &schema.Schema{

View File

@ -56,10 +56,11 @@ func resourceComputeGlobalForwardingRule() *schema.Resource {
}, },
"labels": &schema.Schema{ "labels": &schema.Schema{
Type: schema.TypeMap, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeMap,
Elem: &schema.Schema{Type: schema.TypeString}, Optional: true,
Set: schema.HashString, Elem: &schema.Schema{Type: schema.TypeString},
Set: schema.HashString,
}, },
"label_fingerprint": &schema.Schema{ "label_fingerprint": &schema.Schema{

View File

@ -38,9 +38,10 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
}, },
"version": &schema.Schema{ "version": &schema.Schema{
Type: schema.TypeList, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeList,
Computed: true, Optional: true,
Computed: true,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": &schema.Schema{ "name": &schema.Schema{
@ -159,9 +160,10 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
}, },
"auto_healing_policies": &schema.Schema{ "auto_healing_policies": &schema.Schema{
Type: schema.TypeList, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeList,
MaxItems: 1, Optional: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"health_check": &schema.Schema{ "health_check": &schema.Schema{
@ -180,9 +182,10 @@ func resourceComputeInstanceGroupManager() *schema.Resource {
}, },
"rolling_update_policy": &schema.Schema{ "rolling_update_policy": &schema.Schema{
Type: schema.TypeList, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeList,
MaxItems: 1, Optional: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"minimal_action": &schema.Schema{ "minimal_action": &schema.Schema{

View File

@ -97,6 +97,7 @@ func resourceContainerCluster() *schema.Resource {
}, },
"region": { "region": {
Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
Computed: true, Computed: true,
@ -201,9 +202,10 @@ func resourceContainerCluster() *schema.Resource {
}, },
"enable_binary_authorization": { "enable_binary_authorization": {
Type: schema.TypeBool, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeBool,
Default: false, Optional: true,
Default: false,
}, },
"enable_kubernetes_alpha": { "enable_kubernetes_alpha": {
@ -214,10 +216,11 @@ func resourceContainerCluster() *schema.Resource {
}, },
"enable_tpu": { "enable_tpu": {
Type: schema.TypeBool, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeBool,
ForceNew: true, Optional: true,
Default: false, ForceNew: true,
Default: false,
}, },
"enable_legacy_abac": { "enable_legacy_abac": {
@ -392,9 +395,10 @@ func resourceContainerCluster() *schema.Resource {
}, },
"pod_security_policy_config": { "pod_security_policy_config": {
Type: schema.TypeList, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeList,
MaxItems: 1, Optional: true,
MaxItems: 1,
Elem: &schema.Resource{ Elem: &schema.Resource{
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"enabled": { "enabled": {
@ -501,13 +505,15 @@ func resourceContainerCluster() *schema.Resource {
}, },
"private_cluster": { "private_cluster": {
Type: schema.TypeBool, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeBool,
ForceNew: true, Optional: true,
Default: false, ForceNew: true,
Default: false,
}, },
"master_ipv4_cidr_block": { "master_ipv4_cidr_block": {
Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Type: schema.TypeString, Type: schema.TypeString,
Optional: true, Optional: true,
ForceNew: true, ForceNew: true,

View File

@ -54,9 +54,10 @@ func resourceContainerNodePool() *schema.Resource {
ForceNew: true, ForceNew: true,
}, },
"region": &schema.Schema{ "region": &schema.Schema{
Type: schema.TypeString, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeString,
ForceNew: true, Optional: true,
ForceNew: true,
}, },
}), }),
} }
@ -85,10 +86,11 @@ var schemaNodePool = map[string]*schema.Schema{
}, },
"max_pods_per_node": &schema.Schema{ "max_pods_per_node": &schema.Schema{
Type: schema.TypeInt, Deprecated: "This field is in beta and will be removed from this provider. Use terraform-provider-google-beta to continue using it.",
Optional: true, Type: schema.TypeInt,
ForceNew: true, Optional: true,
Computed: true, ForceNew: true,
Computed: true,
}, },
"initial_node_count": &schema.Schema{ "initial_node_count": &schema.Schema{