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

Enable source control management as option for user to deploy web apps #826

Merged
merged 26 commits into from
Mar 28, 2018
Merged

Enable source control management as option for user to deploy web apps #826

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
21db11c
resolve conflict.
metacpp Feb 13, 2018
78f5d92
Add default value for scm_type.
metacpp Feb 13, 2018
e0cd2e8
add site_source_control_props as attributes.
metacpp Feb 13, 2018
180fd76
Change the naming to simpler one and update documentation.
metacpp Feb 14, 2018
234b56f
Update the documentation and code style.
metacpp Feb 14, 2018
834c914
Update the test case and schema for source_control.
metacpp Feb 14, 2018
749960e
resolve conflict.
metacpp Feb 13, 2018
6437f64
Add default value for scm_type.
metacpp Feb 13, 2018
0765cf6
add site_source_control_props as attributes.
metacpp Feb 13, 2018
5ed289f
Change the naming to simpler one and update documentation.
metacpp Feb 14, 2018
cc4de93
Update the documentation and code style.
metacpp Feb 14, 2018
f3c7cd7
Update the test case and schema for source_control.
metacpp Feb 14, 2018
88714a9
only setting the source control block when there's values to be set
tombuildsstuff Feb 15, 2018
423ffc1
Merge branch 'master' into hack_scm
metacpp Feb 16, 2018
bbba70f
Resolve conflict.
metacpp Feb 16, 2018
d53a029
update the schema of site_config in app_service_plan to be the same a…
metacpp Feb 16, 2018
5384229
Merge branch 'master' into hack_scm
metacpp Mar 13, 2018
3c1cf85
Merge branch 'hack_scm' of github.com:terraform-providers/terraform-p…
metacpp Mar 13, 2018
1c4e460
add schema for publishing user for FTP and Git deployment.
metacpp Mar 14, 2018
ad47fdb
add expand and flattern for publishing user.
metacpp Mar 17, 2018
2d0fbf8
Add update and read for publishing_user.
metacpp Mar 20, 2018
d0d7ab5
Refine the code, test and documentation to support local git deployment.
metacpp Mar 21, 2018
1ba5381
Merge branch 'master' into hack_scm
metacpp Mar 21, 2018
4860923
Update the schema for site_credential.password to be sensitive.
metacpp Mar 26, 2018
2efd09c
Merge branch 'master' into hack_scm
metacpp Mar 26, 2018
43b5b49
Renaming `user_name` -> `username`
tombuildsstuff Mar 28, 2018
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
15 changes: 15 additions & 0 deletions azurerm/resource_arm_app_service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,15 @@ func resourceArmAppService() *schema.Resource {
Optional: true,
Computed: true,
},
"scm_type": {
Type: schema.TypeString,
Optional: true,
Default: string(web.ScmTypeNone),
ValidateFunc: validation.StringInSlice([]string{
string(web.ScmTypeNone),
string(web.ScmTypeLocalGit),
}, false),
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so it'd also be good to expose the value of the SCM URL as a computed field - which I believe should be returned from the GetSourceControl API call when this is set to ScmTypeLocalGit?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the reminding, this is exactly what I did the recent commit, please see changes.

},
},
},
Expand Down Expand Up @@ -519,6 +528,10 @@ func expandAppServiceSiteConfig(d *schema.ResourceData) web.SiteConfig {
siteConfig.WebSocketsEnabled = utils.Bool(v.(bool))
}

if v, ok := config["scm_type"]; ok {
siteConfig.ScmType = web.ScmType(v.(string))
}

return siteConfig
}

Expand Down Expand Up @@ -590,6 +603,8 @@ func flattenAppServiceSiteConfig(input *web.SiteConfig) []interface{} {
result["websockets_enabled"] = *input.WebSocketsEnabled
}

result["scm_type"] = string(input.ScmType)

results = append(results, result)
return results
}
Expand Down
90 changes: 71 additions & 19 deletions azurerm/resource_arm_app_service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,27 @@ func TestAccAzureRMAppService_webSockets(t *testing.T) {
})
}

func TestAccAzureRMAppService_scmType(t *testing.T) {
resourceName := "azurerm_app_service.test"
ri := acctest.RandInt()
config := testAccAzureRMAppService_scmType(ri, testLocation())

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testCheckAzureRMAppServiceDestroy,
Steps: []resource.TestStep{
{
Config: config,
Check: resource.ComposeTestCheckFunc(
testCheckAzureRMAppServiceExists(resourceName),
resource.TestCheckResourceAttr(resourceName, "site_config.0.scm_type", "LocalGit"),
),
},
},
})
}

func testCheckAzureRMAppServiceDestroy(s *terraform.State) error {
client := testAccProvider.Meta().(*ArmClient).appServicesClient

Expand Down Expand Up @@ -689,7 +710,7 @@ resource "azurerm_app_service" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
app_service_plan_id = "${azurerm_app_service_plan.test.id}"
site_config {
use_32_bit_worker_process = true
use_32_bit_worker_process = true
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -719,7 +740,7 @@ resource "azurerm_app_service" "test" {
resource_group_name = "${azurerm_resource_group.test.name}"
app_service_plan_id = "${azurerm_app_service_plan.test.id}"
site_config {
use_32_bit_worker_process = true
use_32_bit_worker_process = true
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -750,7 +771,7 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

site_config {
always_on = true
always_on = true
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -781,7 +802,7 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

site_config {
use_32_bit_worker_process = true
use_32_bit_worker_process = true
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -812,7 +833,7 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

app_settings {
"foo" = "bar"
"foo" = "bar"
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -871,9 +892,9 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

connection_string {
name = "Example"
value = "some-postgresql-connection-string"
type = "PostgreSQL"
name = "Example"
value = "some-postgresql-connection-string"
type = "PostgreSQL"
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -904,11 +925,11 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

site_config {
default_documents = [
"first.html",
"second.jsp",
"third.aspx",
]
default_documents = [
"first.html",
"second.jsp",
"third.aspx",
]
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -967,7 +988,7 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

site_config {
local_mysql_enabled = true
local_mysql_enabled = true
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -998,7 +1019,7 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

site_config {
managed_pipeline_mode = "Classic"
managed_pipeline_mode = "Classic"
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -1034,7 +1055,7 @@ resource "azurerm_app_service" "test" {
}

tags {
"Hello" = "World"
"Hello" = "World"
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -1065,7 +1086,7 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

tags {
"Hello" = "World"
"Hello" = "World"
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -1096,8 +1117,8 @@ resource "azurerm_app_service" "test" {
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

tags {
"Hello" = "World"
"Terraform" = "AcceptanceTests"
"Hello" = "World"
"Terraform" = "AcceptanceTests"
}
}
`, rInt, location, rInt, rInt)
Expand Down Expand Up @@ -1259,3 +1280,34 @@ resource "azurerm_app_service" "test" {
}
`, rInt, location, rInt, rInt)
}

func testAccAzureRMAppService_scmType(rInt int, location string) string {
return fmt.Sprintf(`
resource "azurerm_resource_group" "test" {
name = "acctestRG-%d"
location = "%s"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aligning at '='?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

}

resource "azurerm_app_service_plan" "test" {
name = "acctestASP-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"

sku {
tier = "Standard"
size = "S1"
}
}

resource "azurerm_app_service" "test" {
name = "acctestAS-%d"
location = "${azurerm_resource_group.test.location}"
resource_group_name = "${azurerm_resource_group.test.name}"
app_service_plan_id = "${azurerm_app_service_plan.test.id}"

site_config {
scm_type = "LocalGit"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reduce spaces here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch.

}
}
`, rInt, location, rInt, rInt)
}
4 changes: 4 additions & 0 deletions website/docs/r/app_service.html.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ resource "azurerm_app_service" "test" {

site_config {
dotnet_framework_version = "v4.0"
scm_type = "LocalGit"
}

app_settings {
Expand Down Expand Up @@ -97,6 +98,7 @@ resource "azurerm_app_service" "test" {
java_version = "1.8"
java_container = "JETTY"
java_container_version = "9.3"
scm_type = "LocalGit"
}
}
```
Expand Down Expand Up @@ -160,6 +162,8 @@ The following arguments are supported:

* `websockets_enabled` - (Optional) Should WebSockets be enabled?

* `scm_type` - (Optional) The Source Control Management Type. Possible values are `None` and `LocalGit`. Defaults to `None`.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd suggest we change this to:

* `scm_type` - (Optional) The type of Source Control enabled for this App Service. Possible values include `None` and `LocalGit`. Defaults to `None`

and add a blue info box below it - stating the other types are coming soon

-> **Note:** Additional Source Control types will be added in the future, once support for them has been added in the Azure SDK for Go.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good suggestion.


## Attributes Reference

The following attributes are exported:
Expand Down