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.

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

support multiple Radius Server for vpn_server_configuration_resource #9308

Merged
merged 10 commits into from
Nov 26, 2020
Merged

support multiple Radius Server for vpn_server_configuration_resource #9308

merged 10 commits into from
Nov 26, 2020

Conversation

Sensitive: true,
},

"server": {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Instead of adding a sub block here, can we just remove the max items on radius server, add score, and then if score is set, us the new property, and if score is not set & there is only 1 radius server use the old property?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agree, that's a better solution. I'll do the change.

Copy link
Contributor Author

@haiyuazhang haiyuazhang Nov 23, 2020

Choose a reason for hiding this comment

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

I forget to mention that after removing the constrain of max items on radius server, we need to lift client_root_certificate
and server_root_certificate in the radius server block to the outer scope, since these two settings are shared by all radius servers. If so, it will introduce a break-change. Now we're in the situation either introduce a break change or compromise a little bit as what I did in the current PR. So before proceed, I'd like to know your opinion on it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

oh dang, didn't notice those! hmm

What we could do is keep radius_server as is and deprecated it then add a new block radius which would have those two properties and have a servers list inside. Then we can make them conflict so the user has to pick one or the other and we just use the one that is configured?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've done the change based on your suggestion.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@katbyte Since the waiting-response label still there, just ping you again in case you didn't notice my above reply. thanks.

@tombuildsstuff tombuildsstuff added this to the v2.38.0 milestone Nov 20, 2020
@ghost ghost added size/XL and removed size/L labels Nov 25, 2020
Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

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

Thanks, if we can add some more tests i think this'll be good to merge

@@ -98,6 +98,25 @@ func TestAccAzureRMVPNServerConfiguration_radius(t *testing.T) {
})
}

func TestAccAzureRMVPNServerConfiguration_multipleRadius(t *testing.T) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could we add some more tests?

Going from 1 server with the old block -> 1 server with the new block, updating the new block from 1 -> 2 -> 1 -> none?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@katbyte tests has been updated.

Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

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

Thanks @haiyuazhang - LGTM 👍

@katbyte katbyte merged commit 62366bd into hashicorp:master Nov 26, 2020
katbyte added a commit that referenced this pull request Nov 26, 2020
@ghost
Copy link

ghost commented Nov 27, 2020

This has been released in version 2.38.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.38.0"
}
# ... other configuration ...

@ghost
Copy link

ghost commented Dec 27, 2020

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 ghost locked as resolved and limited conversation to collaborators Dec 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants