diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index fff4975..a9e625f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @OpenVPN/openvpn-cloud-terraform-project-admins +* @OpenVPN/cloudconnexa-terraform-project-admins diff --git a/README.md b/README.md index e13399b..6ca215d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Terraform Provider Cloud Connexa +# Terraform Provider CloudConnexa Terraform @@ -12,18 +12,18 @@ OpenVPN -- [Website Cloud Connexa](https://openvpn.net/cloud-vpn/?utm_source=terraform&utm_medium=docs) -- [Terraform Registry](https://registry.terraform.io/providers/OpenVPN/openvpn-cloud/latest) +- [Website CloudConnexa](https://openvpn.net/cloud-vpn/?utm_source=terraform&utm_medium=docs) +- [Terraform Registry](https://registry.terraform.io/providers/OpenVPN/cloudconnexa/latest) ## Description -The Terraform provider for [Cloud Connexa](https://openvpn.net/cloud-vpn/?utm_source=terraform&utm_medium=docs) allows teams to configure and update Cloud Connexa project parameters via their command line. +The Terraform provider for [CloudConnexa](https://openvpn.net/cloud-vpn/?utm_source=terraform&utm_medium=docs) allows teams to configure and update CloudConnexa project parameters via their command line. ## Maintainers This provider plugin is maintained by: -- OpenVPN team at [Cloud Connexa](https://openvpn.net/cloud-vpn/?utm_source=terraform&utm_medium=docs) +- OpenVPN team at [CloudConnexa](https://openvpn.net/cloud-vpn/?utm_source=terraform&utm_medium=docs) - SRE Team at [ANNA Money](https://anna.money/?utm_source=terraform&utm_medium=referral&utm_campaign=docs) / [GitHub ANNA Money](http://github.com/anna-money/) - [@patoarvizu](https://github.com/patoarvizu) @@ -34,17 +34,17 @@ This provider plugin is maintained by: ## Building The Provider -Clone repository to: `$GOPATH/src/github.com/OpenVPN/terraform-provider-openvpn-cloud` +Clone repository to: `$GOPATH/src/github.com/OpenVPN/terraform-provider-cloudconnexa` ```sh mkdir -p $GOPATH/src/github.com/OpenVPN; cd $GOPATH/src/github.com/OpenVPN -git clone git@github.com:OpenVPN/terraform-provider-openvpn-cloud.git +git clone git@github.com:OpenVPN/terraform-provider-cloudconnexa.git ``` Enter the provider directory and build the provider ```sh -cd $GOPATH/src/github.com/OpenVPN/terraform-provider-openvpn-cloud +cd $GOPATH/src/github.com/OpenVPN/terraform-provider-cloudconnexa make build ``` @@ -57,7 +57,7 @@ To compile the provider, run `make build`. This will build the provider and put ```sh make bin ... -$GOPATH/bin/terraform-provider-openvpn-cloud +$GOPATH/bin/terraform-provider-cloudconnexa ... ``` @@ -75,4 +75,4 @@ _Note:_ Acceptance tests create real resources, and often cost money to run. make testacc ``` -_**Please note:** This provider, like Cloud Connexa API, is in beta status. Report any problems via issue in this repo._ +_**Please note:** This provider, like CloudConnexa API, is in beta status. Report any problems via issue in this repo._ diff --git a/cloudconnexa/data_source_connector.go b/cloudconnexa/data_source_connector.go index ed146d2..c8106e1 100644 --- a/cloudconnexa/data_source_connector.go +++ b/cloudconnexa/data_source_connector.go @@ -12,7 +12,7 @@ import ( func dataSourceConnector() *schema.Resource { return &schema.Resource{ - Description: "Use an `cloudconnexa_connector` data source to read an existing Cloud Connexa connector.", + Description: "Use an `cloudconnexa_connector` data source to read an existing CloudConnexa connector.", ReadContext: dataSourceConnectorRead, Schema: map[string]*schema.Schema{ "name": { diff --git a/cloudconnexa/data_source_host.go b/cloudconnexa/data_source_host.go index 47c07f2..ca29cf8 100644 --- a/cloudconnexa/data_source_host.go +++ b/cloudconnexa/data_source_host.go @@ -12,7 +12,7 @@ import ( func dataSourceHost() *schema.Resource { return &schema.Resource{ - Description: "Use an `cloudconnexa_host` data source to read an existing Cloud Connexa connector.", + Description: "Use an `cloudconnexa_host` data source to read an existing CloudConnexa connector.", ReadContext: dataSourceHostRead, Schema: map[string]*schema.Schema{ "name": { diff --git a/cloudconnexa/data_source_network.go b/cloudconnexa/data_source_network.go index ad5e685..2d9c27f 100644 --- a/cloudconnexa/data_source_network.go +++ b/cloudconnexa/data_source_network.go @@ -2,17 +2,18 @@ package cloudconnexa import ( "context" - "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "strconv" "time" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceNetwork() *schema.Resource { return &schema.Resource{ - Description: "Use a `cloudconnexa_network` data source to read an Cloud Connexa network.", + Description: "Use a `cloudconnexa_network` data source to read an CloudConnexa network.", ReadContext: dataSourceNetworkRead, Schema: map[string]*schema.Schema{ "network_id": { diff --git a/cloudconnexa/data_source_network_routes.go b/cloudconnexa/data_source_network_routes.go index 296b72f..557c57a 100644 --- a/cloudconnexa/data_source_network_routes.go +++ b/cloudconnexa/data_source_network_routes.go @@ -2,23 +2,24 @@ package cloudconnexa import ( "context" - "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "strconv" "time" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceNetworkRoutes() *schema.Resource { return &schema.Resource{ - Description: "Use an `cloudconnexa_network_routes` data source to read all the routes associated with an Cloud Connexa network.", + Description: "Use an `cloudconnexa_network_routes` data source to read all the routes associated with an CloudConnexa network.", ReadContext: dataSourceNetworkRoutesRead, Schema: map[string]*schema.Schema{ "network_item_id": { Type: schema.TypeString, Required: true, - Description: "The id of the Cloud Connexa network of the routes to be discovered.", + Description: "The id of the CloudConnexa network of the routes to be discovered.", }, "routes": { Type: schema.TypeList, diff --git a/cloudconnexa/data_source_user.go b/cloudconnexa/data_source_user.go index fde20d9..71138fe 100644 --- a/cloudconnexa/data_source_user.go +++ b/cloudconnexa/data_source_user.go @@ -2,17 +2,18 @@ package cloudconnexa import ( "context" - "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "strconv" "time" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceUser() *schema.Resource { return &schema.Resource{ - Description: "Use a `cloudconnexa_user` data source to read a specific Cloud Connexa user.", + Description: "Use a `cloudconnexa_user` data source to read a specific CloudConnexa user.", ReadContext: dataSourceUserRead, Schema: map[string]*schema.Schema{ "user_id": { diff --git a/cloudconnexa/data_source_user_group.go b/cloudconnexa/data_source_user_group.go index f1ced3a..43a0763 100644 --- a/cloudconnexa/data_source_user_group.go +++ b/cloudconnexa/data_source_user_group.go @@ -2,17 +2,18 @@ package cloudconnexa import ( "context" - "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "strconv" "time" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceUserGroup() *schema.Resource { return &schema.Resource{ - Description: "Use an `cloudconnexa_user_group` data source to read an Cloud Connexa user group.", + Description: "Use an `cloudconnexa_user_group` data source to read an CloudConnexa user group.", ReadContext: dataSourceUserGroupRead, Schema: map[string]*schema.Schema{ "user_group_id": { diff --git a/cloudconnexa/data_source_vpn_region.go b/cloudconnexa/data_source_vpn_region.go index e8d02ad..3bab8f0 100644 --- a/cloudconnexa/data_source_vpn_region.go +++ b/cloudconnexa/data_source_vpn_region.go @@ -2,17 +2,18 @@ package cloudconnexa import ( "context" - "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "strconv" "time" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" ) func dataSourceVpnRegion() *schema.Resource { return &schema.Resource{ - Description: "Use a `cloudconnexa_vpn_region` data source to read an Cloud Connexa VPN region.", + Description: "Use a `cloudconnexa_vpn_region` data source to read an CloudConnexa VPN region.", ReadContext: dataSourceVpnRegionRead, Schema: map[string]*schema.Schema{ "region_id": { diff --git a/cloudconnexa/provider.go b/cloudconnexa/provider.go index ff9796e..4f9237b 100644 --- a/cloudconnexa/provider.go +++ b/cloudconnexa/provider.go @@ -3,6 +3,7 @@ package cloudconnexa import ( "context" "fmt" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "github.com/hashicorp/terraform-plugin-sdk/v2/diag" @@ -22,7 +23,7 @@ func Provider() *schema.Provider { return &schema.Provider{ Schema: map[string]*schema.Schema{ "client_id": { - Description: "The authentication client_id used to connect to Cloud Connexa API. The value can be sourced from " + + Description: "The authentication client_id used to connect to CloudConnexa API. The value can be sourced from " + "the `CLOUDCONNEXA_CLIENT_ID` environment variable.", Type: schema.TypeString, Optional: true, @@ -30,7 +31,7 @@ func Provider() *schema.Provider { DefaultFunc: schema.EnvDefaultFunc(ClientIDEnvVar, nil), }, "client_secret": { - Description: "The authentication client_secret used to connect to Cloud Connexa API. The value can be sourced from " + + Description: "The authentication client_secret used to connect to CloudConnexa API. The value can be sourced from " + "the `CLOUDCONNEXA_CLIENT_SECRET` environment variable.", Type: schema.TypeString, Optional: true, @@ -38,7 +39,7 @@ func Provider() *schema.Provider { DefaultFunc: schema.EnvDefaultFunc(ClientSecretEnvVar, nil), }, "base_url": { - Description: "The target Cloud Connexa Base API URL in the format `https://[companyName].api.openvpn.com`", + Description: "The target CloudConnexa Base API URL in the format `https://[companyName].api.openvpn.com`", Type: schema.TypeString, Required: true, }, diff --git a/cloudconnexa/resource_connector.go b/cloudconnexa/resource_connector.go index 006007f..300881e 100644 --- a/cloudconnexa/resource_connector.go +++ b/cloudconnexa/resource_connector.go @@ -12,7 +12,7 @@ import ( func resourceConnector() *schema.Resource { return &schema.Resource{ - Description: "Use `cloudconnexa_connector` to create an Cloud Connexa connector.\n\n~> NOTE: This only creates the Cloud Connexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", + Description: "Use `cloudconnexa_connector` to create an CloudConnexa connector.\n\n~> NOTE: This only creates the CloudConnexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", CreateContext: resourceConnectorCreate, ReadContext: resourceConnectorRead, DeleteContext: resourceConnectorDelete, @@ -90,7 +90,7 @@ func resourceConnectorCreate(ctx context.Context, d *schema.ResourceData, m inte return append(diags, diag.Diagnostic{ Severity: diag.Warning, Summary: "Connector needs to be set up manually", - Detail: "Terraform only creates the Cloud Connexa connector object, but additional manual steps are required to associate a host in your infrastructure with this connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", + Detail: "Terraform only creates the CloudConnexa connector object, but additional manual steps are required to associate a host in your infrastructure with this connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", }) } diff --git a/cloudconnexa/resource_host.go b/cloudconnexa/resource_host.go index 398f264..37657a1 100644 --- a/cloudconnexa/resource_host.go +++ b/cloudconnexa/resource_host.go @@ -2,9 +2,10 @@ package cloudconnexa import ( "context" - "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "hash/fnv" + "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -12,7 +13,7 @@ import ( func resourceHost() *schema.Resource { return &schema.Resource{ - Description: "Use `cloudconnexa_host` to create an Cloud Connexa host.", + Description: "Use `cloudconnexa_host` to create an CloudConnexa host.", CreateContext: resourceHostCreate, ReadContext: resourceHostRead, UpdateContext: resourceHostUpdate, @@ -135,7 +136,7 @@ func resourceHostCreate(ctx context.Context, d *schema.ResourceData, m interface return append(diags, diag.Diagnostic{ Severity: diag.Warning, Summary: "The connector for this host needs to be set up manually", - Detail: "Terraform only creates the Cloud Connexa connector object for this host, but additional manual steps are required to associate a host in your infrastructure with this connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", + Detail: "Terraform only creates the CloudConnexa connector object for this host, but additional manual steps are required to associate a host in your infrastructure with this connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", }) } diff --git a/cloudconnexa/resource_network.go b/cloudconnexa/resource_network.go index fed8f92..f69d0e7 100644 --- a/cloudconnexa/resource_network.go +++ b/cloudconnexa/resource_network.go @@ -12,7 +12,7 @@ import ( func resourceNetwork() *schema.Resource { return &schema.Resource{ - Description: "Use `cloudconnexa_network` to create an Cloud Connexa Network.", + Description: "Use `cloudconnexa_network` to create an CloudConnexa Network.", CreateContext: resourceNetworkCreate, ReadContext: resourceNetworkRead, UpdateContext: resourceNetworkUpdate, @@ -210,7 +210,7 @@ func resourceNetworkCreate(ctx context.Context, d *schema.ResourceData, m interf return append(diags, diag.Diagnostic{ Severity: diag.Warning, Summary: "The default connector for this network needs to be set up manually", - Detail: "Terraform only creates the Cloud Connexa default connector object for this network, but additional manual steps are required to associate a host in your infrastructure with this connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", + Detail: "Terraform only creates the CloudConnexa default connector object for this network, but additional manual steps are required to associate a host in your infrastructure with this connector. Go to https://openvpn.net/cloud-docs/connector/ for more information.", }) } diff --git a/cloudconnexa/resource_route.go b/cloudconnexa/resource_route.go index e538e97..48f006e 100644 --- a/cloudconnexa/resource_route.go +++ b/cloudconnexa/resource_route.go @@ -12,7 +12,7 @@ import ( func resourceRoute() *schema.Resource { return &schema.Resource{ - Description: "Use `cloudconnexa_route` to create a route on an Cloud Connexa network.", + Description: "Use `cloudconnexa_route` to create a route on an CloudConnexa network.", CreateContext: resourceRouteCreate, UpdateContext: resourceRouteUpdate, ReadContext: resourceRouteRead, diff --git a/cloudconnexa/resource_service.go b/cloudconnexa/resource_service.go index 58d106e..cc3d045 100644 --- a/cloudconnexa/resource_service.go +++ b/cloudconnexa/resource_service.go @@ -31,7 +31,7 @@ func resourceIPService() *schema.Resource { }, "description": { Type: schema.TypeString, - Default: "Created by Terraform Cloud Connexa Provider", + Default: "Created by Terraform CloudConnexa Provider", ValidateFunc: validation.StringLenBetween(1, 255), Optional: true, }, diff --git a/cloudconnexa/resource_user.go b/cloudconnexa/resource_user.go index dc63c19..c6ea9db 100644 --- a/cloudconnexa/resource_user.go +++ b/cloudconnexa/resource_user.go @@ -2,6 +2,7 @@ package cloudconnexa import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -10,7 +11,7 @@ import ( func resourceUser() *schema.Resource { return &schema.Resource{ - Description: "Use `cloudconnexa_user` to create an Cloud Connexa user.", + Description: "Use `cloudconnexa_user` to create an CloudConnexa user.", CreateContext: resourceUserCreate, ReadContext: resourceUserRead, UpdateContext: resourceUserUpdate, @@ -30,7 +31,7 @@ func resourceUser() *schema.Resource { Type: schema.TypeString, Required: true, ValidateFunc: validation.StringLenBetween(1, 120), - Description: "An invitation to Cloud Connexa account will be sent to this email. It will include an initial password and a VPN setup guide.", + Description: "An invitation to CloudConnexa account will be sent to this email. It will include an initial password and a VPN setup guide.", }, "first_name": { Type: schema.TypeString, @@ -61,7 +62,7 @@ func resourceUser() *schema.Resource { Optional: true, ForceNew: true, MaxItems: 1, - Description: "When a user signs in, the device that they use will be added to their account. You can read more at [Cloud Connexa Device](https://openvpn.net/cloud-docs/device/).", + Description: "When a user signs in, the device that they use will be added to their account. You can read more at [CloudConnexa Device](https://openvpn.net/cloud-docs/device/).", Elem: &schema.Resource{ Schema: map[string]*schema.Schema{ "name": { @@ -134,7 +135,7 @@ func resourceUserCreate(ctx context.Context, d *schema.ResourceData, m interface return append(diags, diag.Diagnostic{ Severity: diag.Warning, Summary: "The user's role cannot be changed using the code.", - Detail: "There is a bug in Cloud Connexa API that prevents setting the user's role during the creation. All users are created as Members by default. Once it's fixed, the provider will be updated accordingly.", + Detail: "There is a bug in CloudConnexa API that prevents setting the user's role during the creation. All users are created as Members by default. Once it's fixed, the provider will be updated accordingly.", }) } @@ -144,7 +145,7 @@ func resourceUserRead(ctx context.Context, d *schema.ResourceData, m interface{} userId := d.Id() u, err := c.Users.Get(userId) - // If group_id is not set, Cloud Connexa sets it to the default group. + // If group_id is not set, CloudConnexa sets it to the default group. var groupId string if d.Get("group_id") == "" { // The group has not been explicitly set. diff --git a/cloudconnexa/resource_user_group.go b/cloudconnexa/resource_user_group.go index 0addd05..8a7ff66 100644 --- a/cloudconnexa/resource_user_group.go +++ b/cloudconnexa/resource_user_group.go @@ -2,6 +2,7 @@ package cloudconnexa import ( "context" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" @@ -10,7 +11,7 @@ import ( func resourceUserGroup() *schema.Resource { return &schema.Resource{ - Description: "Use `cloudconnexa_user_group` to create an Cloud Connexa user group.", + Description: "Use `cloudconnexa_user_group` to create an CloudConnexa user group.", CreateContext: resourceUserGroupCreate, ReadContext: resourceUserGroupRead, UpdateContext: resourceUserGroupUpdate, diff --git a/docs/data-sources/connector.md b/docs/data-sources/connector.md index 7f08612..61dfb65 100644 --- a/docs/data-sources/connector.md +++ b/docs/data-sources/connector.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_connector Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use an cloudconnexa_connector data source to read an existing Cloud Connexa connector. + Use an cloudconnexa_connector data source to read an existing CloudConnexa connector. --- # cloudconnexa_connector (Data Source) -Use an `cloudconnexa_connector` data source to read an existing Cloud Connexa connector. +Use an `cloudconnexa_connector` data source to read an existing CloudConnexa connector. diff --git a/docs/data-sources/host.md b/docs/data-sources/host.md index b628d72..748e978 100644 --- a/docs/data-sources/host.md +++ b/docs/data-sources/host.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_host Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use an cloudconnexa_host data source to read an existing Cloud Connexa connector. + Use an cloudconnexa_host data source to read an existing CloudConnexa connector. --- # cloudconnexa_host (Data Source) -Use an `cloudconnexa_host` data source to read an existing Cloud Connexa connector. +Use an `cloudconnexa_host` data source to read an existing CloudConnexa connector. diff --git a/docs/data-sources/network.md b/docs/data-sources/network.md index 1726893..739f4af 100644 --- a/docs/data-sources/network.md +++ b/docs/data-sources/network.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_network Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use a cloudconnexa_network data source to read an Cloud Connexa network. + Use a cloudconnexa_network data source to read an CloudConnexa network. --- # cloudconnexa_network (Data Source) -Use a `cloudconnexa_network` data source to read an Cloud Connexa network. +Use a `cloudconnexa_network` data source to read an CloudConnexa network. diff --git a/docs/data-sources/network_routes.md b/docs/data-sources/network_routes.md index 1859bd6..c18be28 100644 --- a/docs/data-sources/network_routes.md +++ b/docs/data-sources/network_routes.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_network_routes Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use an cloudconnexa_network_routes data source to read all the routes associated with an Cloud Connexa network. + Use an cloudconnexa_network_routes data source to read all the routes associated with an CloudConnexa network. --- # cloudconnexa_network_routes (Data Source) -Use an `cloudconnexa_network_routes` data source to read all the routes associated with an Cloud Connexa network. +Use an `cloudconnexa_network_routes` data source to read all the routes associated with an CloudConnexa network. @@ -17,7 +17,7 @@ Use an `cloudconnexa_network_routes` data source to read all the routes associat ### Required -- `network_item_id` (String) The id of the Cloud Connexa network of the routes to be discovered. +- `network_item_id` (String) The id of the CloudConnexa network of the routes to be discovered. ### Read-Only diff --git a/docs/data-sources/user.md b/docs/data-sources/user.md index c778a17..13b1357 100644 --- a/docs/data-sources/user.md +++ b/docs/data-sources/user.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_user Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use a cloudconnexa_user data source to read a specific Cloud Connexa user. + Use a cloudconnexa_user data source to read a specific CloudConnexa user. --- # cloudconnexa_user (Data Source) -Use a `cloudconnexa_user` data source to read a specific Cloud Connexa user. +Use a `cloudconnexa_user` data source to read a specific CloudConnexa user. diff --git a/docs/data-sources/user_group.md b/docs/data-sources/user_group.md index f084ea5..a82a595 100644 --- a/docs/data-sources/user_group.md +++ b/docs/data-sources/user_group.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_user_group Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use an cloudconnexa_user_group data source to read an Cloud Connexa user group. + Use an cloudconnexa_user_group data source to read an CloudConnexa user group. --- # cloudconnexa_user_group (Data Source) -Use an `cloudconnexa_user_group` data source to read an Cloud Connexa user group. +Use an `cloudconnexa_user_group` data source to read an CloudConnexa user group. diff --git a/docs/data-sources/vpn_region.md b/docs/data-sources/vpn_region.md index 8afe0a4..5f61b9e 100644 --- a/docs/data-sources/vpn_region.md +++ b/docs/data-sources/vpn_region.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_vpn_region Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use a cloudconnexa_vpn_region data source to read an Cloud Connexa VPN region. + Use a cloudconnexa_vpn_region data source to read an CloudConnexa VPN region. --- # cloudconnexa_vpn_region (Data Source) -Use a `cloudconnexa_vpn_region` data source to read an Cloud Connexa VPN region. +Use a `cloudconnexa_vpn_region` data source to read an CloudConnexa VPN region. diff --git a/docs/index.md b/docs/index.md index c74fbad..97e6381 100644 --- a/docs/index.md +++ b/docs/index.md @@ -8,16 +8,16 @@ description: |- # CloudConnexa Provider -!> **WARNING:** This provider is experimental and support for it is on a best-effort basis. Additionally, the underlying API for Cloud Connexa is on Beta, which means that future versions of the provider may introduce breaking changes. Should that happen, migration documentation and support will also be provided on a best-effort basis. +!> **WARNING:** This provider is experimental and support for it is on a best-effort basis. Additionally, the underlying API for CloudConnexa is on Beta, which means that future versions of the provider may introduce breaking changes. Should that happen, migration documentation and support will also be provided on a best-effort basis. -Use this provider to interact with the [Cloud Connexa API](https://openvpn.net/cloud-docs/developer/index.html). +Use this provider to interact with the [CloudConnexa API](https://openvpn.net/cloud-docs/developer/index.html). ## Schema ### Required -- **base_url** (String) The base url of your Cloud Connexa account. +- **base_url** (String) The base url of your CloudConnexa account. ### Optional @@ -26,11 +26,11 @@ Use this provider to interact with the [Cloud Connexa API](https://openvpn.net/c ### Credentials -To authenticate with the Cloud Connexa API, you'll need the client_id and client_secret. -These credentials can be found in the Cloud Connexa Portal. +To authenticate with the CloudConnexa API, you'll need the client_id and client_secret. +These credentials can be found in the CloudConnexa Portal. Go to the Settings page and click on the API tab. From there, you can enable the API and generate new authentication credentials. Additionally, you'll find Swagger documentation for the API in the same location. More documentation on the OpenVPN API can be found here: -[Cloud Connexa API Documentation](https://openvpn.net/cloud-docs/developer/cloudconnexa-api.html) \ No newline at end of file +[CloudConnexa API Documentation](https://openvpn.net/cloud-docs/developer/cloudconnexa-api.html) diff --git a/docs/resources/connector.md b/docs/resources/connector.md index 845eb1a..bf4c50b 100644 --- a/docs/resources/connector.md +++ b/docs/resources/connector.md @@ -3,15 +3,15 @@ page_title: "cloudconnexa_connector Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_connector to create an Cloud Connexa connector. - ~> NOTE: This only creates the Cloud Connexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. + Use cloudconnexa_connector to create an CloudConnexa connector. + ~> NOTE: This only creates the CloudConnexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. --- # cloudconnexa_connector (Resource) -Use `cloudconnexa_connector` to create an Cloud Connexa connector. +Use `cloudconnexa_connector` to create an CloudConnexa connector. -~> NOTE: This only creates the Cloud Connexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. +~> NOTE: This only creates the CloudConnexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. @@ -39,4 +39,4 @@ A connector can be imported using the connector ID, which can be fetched directl terraform import cloudconnexa_connector.connector ``` -~> NOTE: If the Terraform resource settings are different from the imported connector, the next time you run `terraform apply` the provider will attempt to delete and recreate the connector, which will require you to re-configure the instance manually. \ No newline at end of file +~> NOTE: If the Terraform resource settings are different from the imported connector, the next time you run `terraform apply` the provider will attempt to delete and recreate the connector, which will require you to re-configure the instance manually. diff --git a/docs/resources/host.md b/docs/resources/host.md index 62fc611..9f5168c 100644 --- a/docs/resources/host.md +++ b/docs/resources/host.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_host Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_host to create an Cloud Connexa host. + Use cloudconnexa_host to create an CloudConnexa host. --- # cloudconnexa_host (Resource) -Use `cloudconnexa_host` to create an Cloud Connexa host. +Use `cloudconnexa_host` to create an CloudConnexa host. @@ -52,4 +52,4 @@ A host can be imported using the DNS record ID, which can be fetched directly fr ``` terraform import cloudconnexa_host.host -``` \ No newline at end of file +``` diff --git a/docs/resources/network.md b/docs/resources/network.md index b7784b1..536c499 100644 --- a/docs/resources/network.md +++ b/docs/resources/network.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_network Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_network to create an Cloud Connexa Network. + Use cloudconnexa_network to create an CloudConnexa Network. --- # cloudconnexa_network (Resource) -Use `cloudconnexa_network` to create an Cloud Connexa Network. +Use `cloudconnexa_network` to create an CloudConnexa Network. @@ -70,4 +70,4 @@ A network can be imported using the network ID, which can be fetched directly fr terraform import cloudconnexa_network.network ``` -~> NOTE: This will only import the network itslef, but it'll create a new connector and a new route as its defaults. There is currently no way to import an existing connector and route along with a network. The existing connector(s)/route(s) will continue to work, but you'll need to set a `default_connector` and a `default_route` that don't collide with your existing resources. \ No newline at end of file +~> NOTE: This will only import the network itslef, but it'll create a new connector and a new route as its defaults. There is currently no way to import an existing connector and route along with a network. The existing connector(s)/route(s) will continue to work, but you'll need to set a `default_connector` and a `default_route` that don't collide with your existing resources. diff --git a/docs/resources/route.md b/docs/resources/route.md index 30e96e4..26c8a1d 100644 --- a/docs/resources/route.md +++ b/docs/resources/route.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_route Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_route to create a route on an Cloud Connexa network. + Use cloudconnexa_route to create a route on an CloudConnexa network. --- # cloudconnexa_route (Resource) -Use `cloudconnexa_route` to create a route on an Cloud Connexa network. +Use `cloudconnexa_route` to create a route on an CloudConnexa network. @@ -31,4 +31,4 @@ A route can be imported using the route ID, which can be fetched directly from t ``` terraform import cloudconnexa_route.route -``` \ No newline at end of file +``` diff --git a/docs/resources/user.md b/docs/resources/user.md index 5180af9..ceef4ad 100644 --- a/docs/resources/user.md +++ b/docs/resources/user.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_user Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_user to create an Cloud Connexa user. + Use cloudconnexa_user to create an CloudConnexa user. --- # cloudconnexa_user (Resource) -Use `cloudconnexa_user` to create an Cloud Connexa user. +Use `cloudconnexa_user` to create an CloudConnexa user. @@ -17,14 +17,14 @@ Use `cloudconnexa_user` to create an Cloud Connexa user. ### Required -- `email` (String) An invitation to Cloud Connexa account will be sent to this email. It will include an initial password and a VPN setup guide. +- `email` (String) An invitation to CloudConnexa account will be sent to this email. It will include an initial password and a VPN setup guide. - `first_name` (String) User's first name. - `last_name` (String) User's last name. - `username` (String) A username for the user. ### Optional -- `devices` (Block List, Max: 1) When a user signs in, the device that they use will be added to their account. You can read more at [Cloud Connexa Device](https://openvpn.net/cloud-docs/device/). (see [below for nested schema](#nestedblock--devices)) +- `devices` (Block List, Max: 1) When a user signs in, the device that they use will be added to their account. You can read more at [CloudConnexa Device](https://openvpn.net/cloud-docs/device/). (see [below for nested schema](#nestedblock--devices)) - `group_id` (String) The UUID of a user's group. ### Read-Only diff --git a/e2e/integration_test.go b/e2e/integration_test.go index 95767c7..c951448 100644 --- a/e2e/integration_test.go +++ b/e2e/integration_test.go @@ -2,14 +2,15 @@ package e2e import ( "fmt" - "github.com/OpenVPN/terraform-provider-openvpn-cloud/cloudconnexa" + "os" + "testing" + "time" + + "github.com/OpenVPN/terraform-provider-cloudconnexa/cloudconnexa" "github.com/gruntwork-io/terratest/modules/terraform" api "github.com/openvpn/cloudconnexa-go-client/v2/cloudconnexa" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "os" - "testing" - "time" ) const ( diff --git a/e2e/setup/ec2.tf b/e2e/setup/ec2.tf index 9476ebf..3e79aaf 100644 --- a/e2e/setup/ec2.tf +++ b/e2e/setup/ec2.tf @@ -2,8 +2,8 @@ provider "aws" { region = "eu-central-1" default_tags { tags = { - task-group = "terraform-provider-openvpn-cloud" - created-by = "Terraform/terraform-provider-openvpn-cloud" + task-group = "terraform-provider-cloudconnexa" + created-by = "Terraform/terraform-provider-cloudconnexa" } } } diff --git a/e2e/setup/main.tf b/e2e/setup/main.tf index 77e3a31..0a89924 100644 --- a/e2e/setup/main.tf +++ b/e2e/setup/main.tf @@ -1,13 +1,13 @@ terraform { required_providers { - openvpn-cloud = { + cloudconnexa = { version = "0.0.11" - source = "cloudconnexa.dev/openvpn/openvpncloud" + source = "cloudconnexa.dev/openvpn/cloudconnexa" } } } -provider "openvpn-cloud" { +provider "cloudconnexa" { base_url = "" } @@ -26,7 +26,7 @@ resource "cloudconnexa_host" "host" { vpn_region_id = "us-west-1" } - provider = openvpn-cloud + provider = cloudconnexa } locals { diff --git a/example/backend.tf b/example/backend.tf index bca607f..a09257a 100644 --- a/example/backend.tf +++ b/example/backend.tf @@ -1,7 +1,7 @@ terraform { backend "local" {} required_providers { - openvpncloud = { + cloudconnexa = { source = "OpenVPN/cloudconnexa" version = "0.0.12" } diff --git a/example/provider.tf b/example/provider.tf index 0005b48..1b65a18 100644 --- a/example/provider.tf +++ b/example/provider.tf @@ -1,4 +1,4 @@ -provider "openvpncloud" { +provider "cloudconnexa" { base_url = "https://${var.company_name}.api.openvpn.com" } diff --git a/go.mod b/go.mod index db2dd5c..5e811c8 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/OpenVPN/terraform-provider-openvpn-cloud +module github.com/OpenVPN/terraform-provider-cloudconnexa go 1.21 diff --git a/main.go b/main.go index 3146076..a19d285 100644 --- a/main.go +++ b/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/OpenVPN/terraform-provider-openvpn-cloud/cloudconnexa" + "github.com/OpenVPN/terraform-provider-cloudconnexa/cloudconnexa" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/v2/plugin" ) diff --git a/templates/data-sources/host.md b/templates/data-sources/host.md index b628d72..748e978 100644 --- a/templates/data-sources/host.md +++ b/templates/data-sources/host.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_host Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use an cloudconnexa_host data source to read an existing Cloud Connexa connector. + Use an cloudconnexa_host data source to read an existing CloudConnexa connector. --- # cloudconnexa_host (Data Source) -Use an `cloudconnexa_host` data source to read an existing Cloud Connexa connector. +Use an `cloudconnexa_host` data source to read an existing CloudConnexa connector. diff --git a/templates/data-sources/network.md b/templates/data-sources/network.md index 1726893..739f4af 100644 --- a/templates/data-sources/network.md +++ b/templates/data-sources/network.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_network Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use a cloudconnexa_network data source to read an Cloud Connexa network. + Use a cloudconnexa_network data source to read an CloudConnexa network. --- # cloudconnexa_network (Data Source) -Use a `cloudconnexa_network` data source to read an Cloud Connexa network. +Use a `cloudconnexa_network` data source to read an CloudConnexa network. diff --git a/templates/data-sources/network_routes.md b/templates/data-sources/network_routes.md index 1859bd6..c18be28 100644 --- a/templates/data-sources/network_routes.md +++ b/templates/data-sources/network_routes.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_network_routes Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use an cloudconnexa_network_routes data source to read all the routes associated with an Cloud Connexa network. + Use an cloudconnexa_network_routes data source to read all the routes associated with an CloudConnexa network. --- # cloudconnexa_network_routes (Data Source) -Use an `cloudconnexa_network_routes` data source to read all the routes associated with an Cloud Connexa network. +Use an `cloudconnexa_network_routes` data source to read all the routes associated with an CloudConnexa network. @@ -17,7 +17,7 @@ Use an `cloudconnexa_network_routes` data source to read all the routes associat ### Required -- `network_item_id` (String) The id of the Cloud Connexa network of the routes to be discovered. +- `network_item_id` (String) The id of the CloudConnexa network of the routes to be discovered. ### Read-Only diff --git a/templates/data-sources/user.md b/templates/data-sources/user.md index c778a17..13b1357 100644 --- a/templates/data-sources/user.md +++ b/templates/data-sources/user.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_user Data Source - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use a cloudconnexa_user data source to read a specific Cloud Connexa user. + Use a cloudconnexa_user data source to read a specific CloudConnexa user. --- # cloudconnexa_user (Data Source) -Use a `cloudconnexa_user` data source to read a specific Cloud Connexa user. +Use a `cloudconnexa_user` data source to read a specific CloudConnexa user. diff --git a/templates/index.md.tmpl b/templates/index.md.tmpl index a04d270..c070a86 100644 --- a/templates/index.md.tmpl +++ b/templates/index.md.tmpl @@ -8,16 +8,16 @@ description: |- # {{ .ProviderShortName }} Provider -!> **WARNING:** This provider is experimental and support for it is on a best-effort basis. Additionally, the underlying API for Cloud Connexa is on Beta, which means that future versions of the provider may introduce breaking changes. Should that happen, migration documentation and support will also be provided on a best-effort basis. +!> **WARNING:** This provider is experimental and support for it is on a best-effort basis. Additionally, the underlying API for CloudConnexa is on Beta, which means that future versions of the provider may introduce breaking changes. Should that happen, migration documentation and support will also be provided on a best-effort basis. -Use this provider to interact with the [Cloud Connexa API](https://openvpn.net/cloud-docs/api-guide/). +Use this provider to interact with the [CloudConnexa API](https://openvpn.net/cloud-docs/api-guide/). ## Schema ### Required -- **base_url** (String) The base url of your Cloud Connexa accout. +- **base_url** (String) The base url of your CloudConnexa accout. ### Optional diff --git a/templates/resources/connector.md b/templates/resources/connector.md index 845eb1a..bf4c50b 100644 --- a/templates/resources/connector.md +++ b/templates/resources/connector.md @@ -3,15 +3,15 @@ page_title: "cloudconnexa_connector Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_connector to create an Cloud Connexa connector. - ~> NOTE: This only creates the Cloud Connexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. + Use cloudconnexa_connector to create an CloudConnexa connector. + ~> NOTE: This only creates the CloudConnexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. --- # cloudconnexa_connector (Resource) -Use `cloudconnexa_connector` to create an Cloud Connexa connector. +Use `cloudconnexa_connector` to create an CloudConnexa connector. -~> NOTE: This only creates the Cloud Connexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. +~> NOTE: This only creates the CloudConnexa connector object. Additional manual steps are required to associate a host in your infrastructure with the connector. Go to https://openvpn.net/cloud-docs/connector/ for more information. @@ -39,4 +39,4 @@ A connector can be imported using the connector ID, which can be fetched directl terraform import cloudconnexa_connector.connector ``` -~> NOTE: If the Terraform resource settings are different from the imported connector, the next time you run `terraform apply` the provider will attempt to delete and recreate the connector, which will require you to re-configure the instance manually. \ No newline at end of file +~> NOTE: If the Terraform resource settings are different from the imported connector, the next time you run `terraform apply` the provider will attempt to delete and recreate the connector, which will require you to re-configure the instance manually. diff --git a/templates/resources/host.md b/templates/resources/host.md index 62fc611..9f5168c 100644 --- a/templates/resources/host.md +++ b/templates/resources/host.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_host Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_host to create an Cloud Connexa host. + Use cloudconnexa_host to create an CloudConnexa host. --- # cloudconnexa_host (Resource) -Use `cloudconnexa_host` to create an Cloud Connexa host. +Use `cloudconnexa_host` to create an CloudConnexa host. @@ -52,4 +52,4 @@ A host can be imported using the DNS record ID, which can be fetched directly fr ``` terraform import cloudconnexa_host.host -``` \ No newline at end of file +``` diff --git a/templates/resources/network.md b/templates/resources/network.md index b7784b1..536c499 100644 --- a/templates/resources/network.md +++ b/templates/resources/network.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_network Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_network to create an Cloud Connexa Network. + Use cloudconnexa_network to create an CloudConnexa Network. --- # cloudconnexa_network (Resource) -Use `cloudconnexa_network` to create an Cloud Connexa Network. +Use `cloudconnexa_network` to create an CloudConnexa Network. @@ -70,4 +70,4 @@ A network can be imported using the network ID, which can be fetched directly fr terraform import cloudconnexa_network.network ``` -~> NOTE: This will only import the network itslef, but it'll create a new connector and a new route as its defaults. There is currently no way to import an existing connector and route along with a network. The existing connector(s)/route(s) will continue to work, but you'll need to set a `default_connector` and a `default_route` that don't collide with your existing resources. \ No newline at end of file +~> NOTE: This will only import the network itslef, but it'll create a new connector and a new route as its defaults. There is currently no way to import an existing connector and route along with a network. The existing connector(s)/route(s) will continue to work, but you'll need to set a `default_connector` and a `default_route` that don't collide with your existing resources. diff --git a/templates/resources/route.md b/templates/resources/route.md index 30e96e4..26c8a1d 100644 --- a/templates/resources/route.md +++ b/templates/resources/route.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_route Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_route to create a route on an Cloud Connexa network. + Use cloudconnexa_route to create a route on an CloudConnexa network. --- # cloudconnexa_route (Resource) -Use `cloudconnexa_route` to create a route on an Cloud Connexa network. +Use `cloudconnexa_route` to create a route on an CloudConnexa network. @@ -31,4 +31,4 @@ A route can be imported using the route ID, which can be fetched directly from t ``` terraform import cloudconnexa_route.route -``` \ No newline at end of file +``` diff --git a/templates/resources/user.md b/templates/resources/user.md index 5180af9..ceef4ad 100644 --- a/templates/resources/user.md +++ b/templates/resources/user.md @@ -3,12 +3,12 @@ page_title: "cloudconnexa_user Resource - terraform-provider-cloudconnexa" subcategory: "" description: |- - Use cloudconnexa_user to create an Cloud Connexa user. + Use cloudconnexa_user to create an CloudConnexa user. --- # cloudconnexa_user (Resource) -Use `cloudconnexa_user` to create an Cloud Connexa user. +Use `cloudconnexa_user` to create an CloudConnexa user. @@ -17,14 +17,14 @@ Use `cloudconnexa_user` to create an Cloud Connexa user. ### Required -- `email` (String) An invitation to Cloud Connexa account will be sent to this email. It will include an initial password and a VPN setup guide. +- `email` (String) An invitation to CloudConnexa account will be sent to this email. It will include an initial password and a VPN setup guide. - `first_name` (String) User's first name. - `last_name` (String) User's last name. - `username` (String) A username for the user. ### Optional -- `devices` (Block List, Max: 1) When a user signs in, the device that they use will be added to their account. You can read more at [Cloud Connexa Device](https://openvpn.net/cloud-docs/device/). (see [below for nested schema](#nestedblock--devices)) +- `devices` (Block List, Max: 1) When a user signs in, the device that they use will be added to their account. You can read more at [CloudConnexa Device](https://openvpn.net/cloud-docs/device/). (see [below for nested schema](#nestedblock--devices)) - `group_id` (String) The UUID of a user's group. ### Read-Only