New Resource: `azurerm_spring_cloud_service` #4928

njuCZ · 2019-11-20T09:19:27Z

the first PR of issue #4891
this PR includes changes:

spring cloud service
spring cloud config server
add relevant azure spring cloud go sdk to vender

config server is a property of spring cloud service, but currently the create api does not take care of config server part, it is a part of UPDATE operation by azure spring cloud team's design. So I split them and implement two different resource and datasource

njuCZ · 2019-12-02T07:20:00Z

Could anyone help review this PR?
This PR is about setting up Azure Spring Cloud Instance and spring cloud config server.
There is some following work about spring cloud application and deployment which rely on this PR

njuCZ · 2019-12-06T06:04:58Z

@katbyte Could you please have a review of this PR ?

katbyte

Hi @njuCZ, I've given this a initial review

website/docs/r/spring_cloud_config_server.html.markdown

azurerm/helpers/azure/spring_cloud.go

azurerm/internal/services/appplatform/data_source_spring_cloud.go

azurerm/internal/services/appplatform/data_source_spring_cloud_config_server.go

azurerm/internal/services/appplatform/resource_arm_spring_cloud.go

azurerm/internal/services/appplatform/resource_arm_spring_cloud_config_server.go

njuCZ · 2020-01-22T09:50:36Z

@katbyte thanks for your suggestion, I have modified the codes, Could you please have a look again?

njuCZ · 2020-03-05T02:54:13Z

@katbyte Could you have a review of the modified revision? I am sorry I don't know how to dismiss the Changes requested status

jackofallops

Hi @njuCZ
I've left some comments and change requests, mostly around documentation and a little refactor on the schema to reduce repetition.
There's also a question on API behaviour for the exclusivity of the auth type for repos.
Thanks
Ste

azurerm/internal/services/appplatform/data_source_spring_cloud_service.go

azurerm/internal/services/appplatform/parse/spring_cloud_service_test.go

azurerm/internal/services/appplatform/resource_arm_spring_cloud_service.go

website/docs/r/spring_cloud_service.html.markdown

njuCZ · 2020-03-31T08:25:26Z

@jackofallops thanks for your review suggestions. I have refined the PR accordingly. Could you please have a look again ?

…reating

jackofallops

Hi @njuCZ
Thanks for the changes, looking good. Just a few minor things left I think, mostly for clarity. There's one additional condition I think we should have in there, commented below about guarding against the user specifying both auth types for the config server and pattern repos.

Thanks!

azurerm/internal/services/appplatform/spring_cloud_config_server.go

azurerm/internal/services/appplatform/resource_arm_spring_cloud_service.go

jackofallops · 2020-04-01T07:23:52Z

azurerm/internal/services/appplatform/resource_arm_spring_cloud_service.go

+		if httpBasicAuth := v["http_basic_auth"].([]interface{}); len(httpBasicAuth) > 0 {
+			v := httpBasicAuth[0].(map[string]interface{})
+			result.Username = utils.String(v["username"].(string))
+			result.Password = utils.String(v["password"].(string))
+		}
+		if sshAuth := v["ssh_auth"].([]interface{}); len(sshAuth) > 0 {
+			v := sshAuth[0].(map[string]interface{})
+			result.PrivateKey = utils.String(v["private_key"].(string))
+			result.StrictHostKeyChecking = utils.Bool(v["strict_host_key_checking_enabled"].(bool))
+
+			if hostKey := v["host_key"].(string); hostKey != "" {
+				result.HostKey = utils.String(hostKey)
+			}
+			if hostKeyAlgorithm := v["host_key_algorithm"].(string); hostKeyAlgorithm != "" {
+				result.HostKeyAlgorithm = utils.String(hostKeyAlgorithm)
+			}
+		}


as with the top level repo, we should test against these both being set and error out to the user to prevent both being attempted to be sent to the API since only one will be accepted (based on your comments from the service team that this is conditional based on the protocol used in the URI).

@jackofallops I have added check to prevent setting both the fields, please have a look. Thanks for your suggestion

azurerm/internal/services/appplatform/resource_arm_spring_cloud_service.go

njuCZ · 2020-04-01T09:27:59Z

@jackofallops thanks for the suggestion, Could you please have a look again?

jackofallops

Hi @njuCZ
Thanks again for the changes - looking really close now. Just one schema item (sorry I missed this on previous review) and a slight rewording on a bit of the docs and I believe this will be ready.

Thanks

jackofallops · 2020-04-02T08:54:30Z

website/docs/r/spring_cloud_service.html.markdown

@@ -0,0 +1,132 @@
+subcategory: "App Platform"


Suggested change

subcategory: "App Platform"

---

subcategory: "App Platform"

@jackofallops just curious about this rule, because in my previous comments, Tom told me to remove the first line. #4928 (comment)
so in my future PRs, should I add the first line --- ?

website/docs/r/spring_cloud_service.html.markdown

website/docs/d/spring_cloud_service.html.markdown

azurerm/internal/services/appplatform/spring_cloud_config_server.go

jackofallops · 2020-04-02T14:18:15Z

Hi @njuCZ - Hope you don't mind, I pushed the final suggestions so we can close and merge this asap. Many thanks again for this work.

njuCZ · 2020-04-02T15:13:33Z

many thanks!

ghost · 2020-04-02T23:50:14Z

This has been released in version 2.4.0 of the provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading. As an example:

provider "azurerm" {
    version = "~> 2.4.0"
}
# ... other configuration ...

ghost · 2020-05-03T14:50:12Z

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. If you feel I made an error 🤖 🙉 , please reach out to my human friends 👉 [email protected]. Thanks!

ghost added size/XXL documentation labels Nov 20, 2019

njuCZ force-pushed the springcloud branch from 6ce226c to 7e8bdfd Compare November 20, 2019 09:22

ghost added the dependencies label Nov 21, 2019

njuCZ force-pushed the springcloud branch 2 times, most recently from 4e8b9fe to 6f66ad2 Compare November 29, 2019 02:11

njuCZ force-pushed the springcloud branch 2 times, most recently from f1b526c to 5dff6f9 Compare December 13, 2019 07:44

njuCZ mentioned this pull request Dec 13, 2019

[WIP] add new Resource and Data Source for spring cloud app, deployment and Active deployment #5154

Closed

njuCZ closed this Dec 17, 2019

njuCZ reopened this Dec 17, 2019

njuCZ force-pushed the springcloud branch from 9282f55 to dae6a1a Compare December 24, 2019 03:52

njuCZ requested a review from mbfrahry January 19, 2020 02:48

katbyte changed the title ~~implement resource and data_source of Azure Spring Cloud~~ New Resource: azurerm_spring_cloud Jan 20, 2020

katbyte requested changes Jan 20, 2020

View reviewed changes

katbyte added service/spring waiting-response labels Jan 20, 2020

njuCZ force-pushed the springcloud branch from f1e57e0 to 8d5c804 Compare January 20, 2020 10:11

ghost removed the waiting-response label Jan 22, 2020

njuCZ requested a review from katbyte January 23, 2020 03:08

njuCZ force-pushed the springcloud branch 2 times, most recently from a4a3f4b to 61ccc5b Compare February 23, 2020 09:08

tombuildsstuff added this to the v2.1.0 milestone Feb 23, 2020

njuCZ force-pushed the springcloud branch from 61ccc5b to 571855d Compare February 25, 2020 02:40

njuCZ force-pushed the springcloud branch from 18eb93f to 319a067 Compare March 5, 2020 02:35

njuCZ force-pushed the springcloud branch from 319a067 to 7d65042 Compare March 10, 2020 14:05

tombuildsstuff modified the milestones: v2.3.0, v2.4.0 Mar 26, 2020

jackofallops assigned jackofallops and unassigned tombuildsstuff Mar 27, 2020

njuCZ added 2 commits March 30, 2020 10:37

new resource "azurerm_spring_cloud_service"

c9b9a42

fix conflict

ac1ef42

njuCZ force-pushed the springcloud branch from 63a9f38 to ac1ef42 Compare March 30, 2020 02:41

jackofallops requested changes Mar 30, 2020

View reviewed changes

jackofallops added the waiting-response label Mar 31, 2020

njuCZ added 2 commits March 31, 2020 16:15

update

8bdb8ed

update

f48378f

ghost removed the waiting-response label Mar 31, 2020

njuCZ requested a review from jackofallops March 31, 2020 08:26

njuCZ added 2 commits March 31, 2020 18:29

update

42119ed

avoid sending update request if config_server is not specified when c…

5cc8dd4

…reating

jackofallops requested changes Apr 1, 2020

View reviewed changes

add check for mutually exclusive fields

13bc663

njuCZ requested a review from jackofallops April 2, 2020 01:44

jackofallops requested changes Apr 2, 2020

View reviewed changes

Review fixes

5206cc4

jackofallops approved these changes Apr 2, 2020

View reviewed changes

katbyte merged commit 136a911 into hashicorp:master Apr 2, 2020

katbyte added a commit that referenced this pull request Apr 2, 2020

update CHANGELOG.md to include #4928

d797081

ghost locked and limited conversation to collaborators May 3, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Resource: `azurerm_spring_cloud_service` #4928

New Resource: `azurerm_spring_cloud_service` #4928

njuCZ commented Nov 20, 2019 •

edited

Loading

njuCZ commented Dec 2, 2019

njuCZ commented Dec 6, 2019

katbyte left a comment

njuCZ commented Jan 22, 2020

njuCZ commented Mar 5, 2020

jackofallops left a comment

njuCZ commented Mar 31, 2020

jackofallops left a comment

jackofallops Apr 1, 2020

njuCZ Apr 1, 2020

njuCZ commented Apr 1, 2020

jackofallops left a comment

jackofallops Apr 2, 2020

njuCZ Apr 2, 2020

jackofallops commented Apr 2, 2020

njuCZ commented Apr 2, 2020

ghost commented Apr 2, 2020

ghost commented May 3, 2020

New Resource: azurerm_spring_cloud_service #4928

New Resource: azurerm_spring_cloud_service #4928

Conversation

njuCZ commented Nov 20, 2019 • edited Loading

njuCZ commented Dec 2, 2019

njuCZ commented Dec 6, 2019

katbyte left a comment

Choose a reason for hiding this comment

njuCZ commented Jan 22, 2020

njuCZ commented Mar 5, 2020

jackofallops left a comment

Choose a reason for hiding this comment

njuCZ commented Mar 31, 2020

jackofallops left a comment

Choose a reason for hiding this comment

jackofallops Apr 1, 2020

Choose a reason for hiding this comment

njuCZ Apr 1, 2020

Choose a reason for hiding this comment

njuCZ commented Apr 1, 2020

jackofallops left a comment

Choose a reason for hiding this comment

jackofallops Apr 2, 2020

Choose a reason for hiding this comment

njuCZ Apr 2, 2020

Choose a reason for hiding this comment

jackofallops commented Apr 2, 2020

njuCZ commented Apr 2, 2020

ghost commented Apr 2, 2020

ghost commented May 3, 2020

New Resource: `azurerm_spring_cloud_service` #4928

New Resource: `azurerm_spring_cloud_service` #4928

njuCZ commented Nov 20, 2019 •

edited

Loading