Skip to content

Commit

Permalink
Merge pull request #4597 from terraform-providers/d/devspace
Browse files Browse the repository at this point in the history
r/devspace: updating to API version 2019-04-01
  • Loading branch information
tombuildsstuff authored Oct 14, 2019
2 parents d4d6ed5 + b629c38 commit 7990187
Show file tree
Hide file tree
Showing 532 changed files with 145 additions and 92,318 deletions.
2 changes: 1 addition & 1 deletion azurerm/internal/services/devspace/client.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package devspace

import (
"github.com/Azure/azure-sdk-for-go/services/preview/devspaces/mgmt/2018-06-01-preview/devspaces"
"github.com/Azure/azure-sdk-for-go/services/devspaces/mgmt/2019-04-01/devspaces"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
16 changes: 6 additions & 10 deletions azurerm/resource_arm_devspace_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/devspaces/mgmt/2018-06-01-preview/devspaces"
"github.com/Azure/azure-sdk-for-go/services/devspaces/mgmt/2019-04-01/devspaces"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
Expand Down Expand Up @@ -73,13 +73,6 @@ func resourceArmDevSpaceController() *schema.Resource {
},
},

"host_suffix": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validate.NoEmptyStrings,
},

"target_container_host_resource_id": {
Type: schema.TypeString,
Required: true,
Expand All @@ -101,6 +94,11 @@ func resourceArmDevSpaceController() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},

"host_suffix": {
Type: schema.TypeString,
Computed: true,
},
},
}
}
Expand Down Expand Up @@ -133,7 +131,6 @@ func resourceArmDevSpaceControllerCreate(d *schema.ResourceData, meta interface{

sku := expandDevSpaceControllerSku(d)

hostSuffix := d.Get("host_suffix").(string)
tarCHResId := d.Get("target_container_host_resource_id").(string)
tarCHCredBase64 := d.Get("target_container_host_credentials_base64").(string)

Expand All @@ -142,7 +139,6 @@ func resourceArmDevSpaceControllerCreate(d *schema.ResourceData, meta interface{
Tags: tags.Expand(t),
Sku: sku,
ControllerProperties: &devspaces.ControllerProperties{
HostSuffix: &hostSuffix,
TargetContainerHostResourceID: &tarCHResId,
TargetContainerHostCredentialsBase64: &tarCHCredBase64,
},
Expand Down
2 changes: 0 additions & 2 deletions azurerm/resource_arm_devspace_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@ resource "azurerm_devspace_controller" "test" {
name = "acctestdsc%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
host_suffix = "suffix"
target_container_host_resource_id = "${azurerm_kubernetes_cluster.test.id}"
target_container_host_credentials_base64 = "${base64encode(azurerm_kubernetes_cluster.test.kube_config_raw)}"
Expand All @@ -184,7 +183,6 @@ resource "azurerm_devspace_controller" "import" {
name = "${azurerm_devspace_controller.test.name}"
location = "${azurerm_devspace_controller.test.location}"
resource_group_name = "${azurerm_devspace_controller.test.resource_group_name}"
host_suffix = "${azurerm_devspace_controller.test.host_suffix}"
target_container_host_resource_id = "${azurerm_kubernetes_cluster.test.id}"
target_container_host_credentials_base64 = "${base64encode(azurerm_kubernetes_cluster.test.kube_config_raw)}"
Expand Down
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ module github.com/terraform-providers/terraform-provider-azurerm
require (
github.com/Azure/azure-sdk-for-go v33.2.0+incompatible
github.com/Azure/go-autorest/autorest v0.9.0
github.com/Azure/go-autorest/autorest/azure/auth v0.3.0
github.com/Azure/go-autorest/autorest/date v0.2.0
github.com/btubbs/datetime v0.1.0
github.com/davecgh/go-spew v1.1.1
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 7990187

Please sign in to comment.