Remove leftover Postgresql code and documentation (#527)
* Remove leftover postgresql code * Remove examples * revert go.mod * Revert loadbalancer doc
This commit is contained in:
parent
a58940981e
commit
fe777fd9bc
13 changed files with 19 additions and 71 deletions
1
.github/workflows/tf-acc-test.yaml
vendored
1
.github/workflows/tf-acc-test.yaml
vendored
|
|
@ -25,7 +25,6 @@ jobs:
|
||||||
TF_ACC_OBSERVABILITY_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_OBSERVABILITY_CUSTOM_ENDPOINT }}
|
TF_ACC_OBSERVABILITY_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_OBSERVABILITY_CUSTOM_ENDPOINT }}
|
||||||
TF_ACC_OPENSEARCH_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_OPENSEARCH_CUSTOM_ENDPOINT }}
|
TF_ACC_OPENSEARCH_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_OPENSEARCH_CUSTOM_ENDPOINT }}
|
||||||
TF_ACC_POSTGRESFLEX_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_POSTGRESFLEX_CUSTOM_ENDPOINT }}
|
TF_ACC_POSTGRESFLEX_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_POSTGRESFLEX_CUSTOM_ENDPOINT }}
|
||||||
TF_ACC_POSTGRESQL_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_POSTGRESQL_CUSTOM_ENDPOINT }}
|
|
||||||
TF_ACC_RABBITMQ_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_RABBITMQ_CUSTOM_ENDPOINT }}
|
TF_ACC_RABBITMQ_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_RABBITMQ_CUSTOM_ENDPOINT }}
|
||||||
TF_ACC_REDIS_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_REDIS_CUSTOM_ENDPOINT }}
|
TF_ACC_REDIS_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_REDIS_CUSTOM_ENDPOINT }}
|
||||||
TF_ACC_RESOURCEMANAGER_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_RESOURCEMANAGER_CUSTOM_ENDPOINT }}
|
TF_ACC_RESOURCEMANAGER_CUSTOM_ENDPOINT: ${{ secrets.TF_ACC_RESOURCEMANAGER_CUSTOM_ENDPOINT }}
|
||||||
|
|
|
||||||
|
|
@ -152,11 +152,11 @@ resource "stackit_logme_credential" "example-credential" {
|
||||||
| stackit_observability_instance | stackit_observability_instance | :white_check_mark: | [project_id],[instance_id] | |
|
| stackit_observability_instance | stackit_observability_instance | :white_check_mark: | [project_id],[instance_id] | |
|
||||||
| stackit_observability_job | stackit_observability_scrapeconfig | :white_check_mark: | [project_id],[instance_id],[name] | |
|
| stackit_observability_job | stackit_observability_scrapeconfig | :white_check_mark: | [project_id],[instance_id],[name] | |
|
||||||
| stackit_opensearch_credential | stackit_opensearch_credential | :white_check_mark: | [project_id],[credentials_group_id],[credential_id] | |
|
| stackit_opensearch_credential | stackit_opensearch_credential | :white_check_mark: | [project_id],[credentials_group_id],[credential_id] | |
|
||||||
| stackit_opensearch_instance | stackit_opensearch_instance | :white_check_mark: | [project_id],[instance_id] | |
|
| stackit_opensearch_instance | stackit_opensearch_instance | :white_check_mark: | [project_id],[instance_id] | | |
|
||||||
| stackit_postgres_credential | stackit_postgresql_credential | :white_check_mark: | [project_id],[credentials_group_id],[credential_id] | |
|
|
||||||
| stackit_postgres_flex_instance | stackit_postgresflex_instance | :white_check_mark: | [project_id],[instance_id] | |
|
| stackit_postgres_flex_instance | stackit_postgresflex_instance | :white_check_mark: | [project_id],[instance_id] | |
|
||||||
| stackit_postgres_flex_user | stackit_postgresflex_user | :warning: | [project_id],[instance_id],[user_id] | `password` field will be empty |
|
| stackit_postgres_flex_user | stackit_postgresflex_user | :warning: | [project_id],[instance_id],[user_id] | `password` field will be empty |
|
||||||
| stackit_postgres_instance | stackit_postgresql_instance | :white_check_mark: | [project_id],[instance_id] | |
|
| stackit_postgres_instance | | | | Resource deprecated |
|
||||||
|
| stackit_postgres_credential | | | | Resource deprecated
|
||||||
| stackit_project | stackit_resourcemanager_project | :white_check_mark: | [container_id] | |
|
| stackit_project | stackit_resourcemanager_project | :white_check_mark: | [container_id] | |
|
||||||
| stackit_rabbitmq_credential | stackit_rabbitmq_credential | :white_check_mark: | [project_id],[credentials_group_id],[credential_id] | |
|
| stackit_rabbitmq_credential | stackit_rabbitmq_credential | :white_check_mark: | [project_id],[credentials_group_id],[credential_id] | |
|
||||||
| stackit_rabbitmq_instance | stackit_rabbitmq_instance | :white_check_mark: | [project_id],[instance_id] | |
|
| stackit_rabbitmq_instance | stackit_rabbitmq_instance | :white_check_mark: | [project_id],[instance_id] | |
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,6 @@ Note: AWS specific checks must be skipped as they do not work on STACKIT. For de
|
||||||
- `observability_custom_endpoint` (String) Custom endpoint for the Observability service
|
- `observability_custom_endpoint` (String) Custom endpoint for the Observability service
|
||||||
- `opensearch_custom_endpoint` (String) Custom endpoint for the OpenSearch service
|
- `opensearch_custom_endpoint` (String) Custom endpoint for the OpenSearch service
|
||||||
- `postgresflex_custom_endpoint` (String) Custom endpoint for the PostgresFlex service
|
- `postgresflex_custom_endpoint` (String) Custom endpoint for the PostgresFlex service
|
||||||
- `postgresql_custom_endpoint` (String) Custom endpoint for the PostgreSQL service
|
|
||||||
- `private_key` (String) Private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
|
- `private_key` (String) Private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
|
||||||
- `private_key_path` (String) Path for the private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
|
- `private_key_path` (String) Path for the private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
|
||||||
- `rabbitmq_custom_endpoint` (String) Custom endpoint for the RabbitMQ service
|
- `rabbitmq_custom_endpoint` (String) Custom endpoint for the RabbitMQ service
|
||||||
|
|
|
||||||
|
|
@ -8,25 +8,23 @@ description: |-
|
||||||
To automate the creation of load balancers, OpenStack can be used to setup the supporting infrastructure.
|
To automate the creation of load balancers, OpenStack can be used to setup the supporting infrastructure.
|
||||||
To set up the OpenStack provider, you can create a token through the STACKIT Portal, in your project's Infrastructure API page.
|
To set up the OpenStack provider, you can create a token through the STACKIT Portal, in your project's Infrastructure API page.
|
||||||
There, the OpenStack user domain name, username, and password are generated and can be obtained. The provider can then be configured as follows:
|
There, the OpenStack user domain name, username, and password are generated and can be obtained. The provider can then be configured as follows:
|
||||||
|
```terraform
|
||||||
terraform {
|
terraform {
|
||||||
required_providers {
|
required_providers {
|
||||||
(...)
|
(...)
|
||||||
openstack = {
|
openstack = {
|
||||||
source = "terraform-provider-openstack/openstack"
|
source = "terraform-provider-openstack/openstack"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
provider "openstack" {
|
provider "openstack" {
|
||||||
user_domain_name = "{OpenStack user domain name}"
|
user_domain_name = "{OpenStack user domain name}"
|
||||||
user_name = "{OpenStack username}"
|
user_name = "{OpenStack username}"
|
||||||
password = "{OpenStack password}"
|
password = "{OpenStack password}"
|
||||||
region = "RegionOne"
|
region = "RegionOne"
|
||||||
auth_url = "https://keystone.api.iaas.eu01.stackit.cloud/v3"
|
auth_url = "https://keystone.api.iaas.eu01.stackit.cloud/v3"
|
||||||
}
|
}
|
||||||
|
```
|
||||||
|
|
||||||
Configuring the supporting infrastructure
|
Configuring the supporting infrastructure
|
||||||
The example below uses OpenStack to create the network, router, a public IP address and a compute instance.
|
The example below uses OpenStack to create the network, router, a public IP address and a compute instance.
|
||||||
---
|
---
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
data "stackit_postgresql_credential" "example" {
|
|
||||||
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
credential_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
data "stackit_postgresql_instance" "example" {
|
|
||||||
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
resource "stackit_postgresql_credential" "example" {
|
|
||||||
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
instance_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
}
|
|
||||||
|
|
@ -1,9 +0,0 @@
|
||||||
resource "stackit_postgresql_instance" "example" {
|
|
||||||
project_id = "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
|
|
||||||
name = "example-instance"
|
|
||||||
version = "10"
|
|
||||||
plan_name = "example-plan-name"
|
|
||||||
parameters = {
|
|
||||||
sgw_acl = "x.x.x.x/x,y.y.y.y/y"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -29,7 +29,6 @@ type ProviderData struct {
|
||||||
ObservabilityCustomEndpoint string
|
ObservabilityCustomEndpoint string
|
||||||
OpenSearchCustomEndpoint string
|
OpenSearchCustomEndpoint string
|
||||||
PostgresFlexCustomEndpoint string
|
PostgresFlexCustomEndpoint string
|
||||||
PostgreSQLCustomEndpoint string
|
|
||||||
RabbitMQCustomEndpoint string
|
RabbitMQCustomEndpoint string
|
||||||
RedisCustomEndpoint string
|
RedisCustomEndpoint string
|
||||||
ResourceManagerCustomEndpoint string
|
ResourceManagerCustomEndpoint string
|
||||||
|
|
|
||||||
|
|
@ -48,10 +48,10 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
|
||||||
|
|
||||||
var apiClient *objectstorage.APIClient
|
var apiClient *objectstorage.APIClient
|
||||||
var err error
|
var err error
|
||||||
if providerData.PostgreSQLCustomEndpoint != "" {
|
if providerData.ObjectStorageCustomEndpoint != "" {
|
||||||
apiClient, err = objectstorage.NewAPIClient(
|
apiClient, err = objectstorage.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithEndpoint(providerData.PostgreSQLCustomEndpoint),
|
config.WithEndpoint(providerData.ObjectStorageCustomEndpoint),
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = objectstorage.NewAPIClient(
|
apiClient, err = objectstorage.NewAPIClient(
|
||||||
|
|
|
||||||
|
|
@ -330,7 +330,7 @@ func testAccCheckPostgresFlexDestroy(s *terraform.State) error {
|
||||||
|
|
||||||
instancesToDestroy := []string{}
|
instancesToDestroy := []string{}
|
||||||
for _, rs := range s.RootModule().Resources {
|
for _, rs := range s.RootModule().Resources {
|
||||||
if rs.Type != "stackit_postgresql_instance" {
|
if rs.Type != "stackit_postgresqlflex_instance" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
// instance terraform ID: = "[project_id],[instance_id]"
|
// instance terraform ID: = "[project_id],[instance_id]"
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,6 @@ var (
|
||||||
OpenSearchCustomEndpoint = os.Getenv("TF_ACC_OPENSEARCH_CUSTOM_ENDPOINT")
|
OpenSearchCustomEndpoint = os.Getenv("TF_ACC_OPENSEARCH_CUSTOM_ENDPOINT")
|
||||||
ObservabilityCustomEndpoint = os.Getenv("TF_ACC_OBSERVABILITY_CUSTOM_ENDPOINT")
|
ObservabilityCustomEndpoint = os.Getenv("TF_ACC_OBSERVABILITY_CUSTOM_ENDPOINT")
|
||||||
ObjectStorageCustomEndpoint = os.Getenv("TF_ACC_OBJECTSTORAGE_CUSTOM_ENDPOINT")
|
ObjectStorageCustomEndpoint = os.Getenv("TF_ACC_OBJECTSTORAGE_CUSTOM_ENDPOINT")
|
||||||
PostgreSQLCustomEndpoint = os.Getenv("TF_ACC_POSTGRESQL_CUSTOM_ENDPOINT")
|
|
||||||
PostgresFlexCustomEndpoint = os.Getenv("TF_ACC_POSTGRESFLEX_CUSTOM_ENDPOINT")
|
PostgresFlexCustomEndpoint = os.Getenv("TF_ACC_POSTGRESFLEX_CUSTOM_ENDPOINT")
|
||||||
RabbitMQCustomEndpoint = os.Getenv("TF_ACC_RABBITMQ_CUSTOM_ENDPOINT")
|
RabbitMQCustomEndpoint = os.Getenv("TF_ACC_RABBITMQ_CUSTOM_ENDPOINT")
|
||||||
RedisCustomEndpoint = os.Getenv("TF_ACC_REDIS_CUSTOM_ENDPOINT")
|
RedisCustomEndpoint = os.Getenv("TF_ACC_REDIS_CUSTOM_ENDPOINT")
|
||||||
|
|
@ -221,21 +220,6 @@ func OpenSearchProviderConfig() string {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
func PostgreSQLProviderConfig() string {
|
|
||||||
if PostgreSQLCustomEndpoint == "" {
|
|
||||||
return `
|
|
||||||
provider "stackit" {
|
|
||||||
region = "eu01"
|
|
||||||
}`
|
|
||||||
}
|
|
||||||
return fmt.Sprintf(`
|
|
||||||
provider "stackit" {
|
|
||||||
postgresql_custom_endpoint = "%s"
|
|
||||||
}`,
|
|
||||||
PostgreSQLCustomEndpoint,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
func PostgresFlexProviderConfig() string {
|
func PostgresFlexProviderConfig() string {
|
||||||
if PostgresFlexCustomEndpoint == "" {
|
if PostgresFlexCustomEndpoint == "" {
|
||||||
return `
|
return `
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,6 @@ type providerModel struct {
|
||||||
ArgusCustomEndpoint types.String `tfsdk:"argus_custom_endpoint"`
|
ArgusCustomEndpoint types.String `tfsdk:"argus_custom_endpoint"`
|
||||||
DNSCustomEndpoint types.String `tfsdk:"dns_custom_endpoint"`
|
DNSCustomEndpoint types.String `tfsdk:"dns_custom_endpoint"`
|
||||||
IaaSCustomEndpoint types.String `tfsdk:"iaas_custom_endpoint"`
|
IaaSCustomEndpoint types.String `tfsdk:"iaas_custom_endpoint"`
|
||||||
PostgreSQLCustomEndpoint types.String `tfsdk:"postgresql_custom_endpoint"`
|
|
||||||
PostgresFlexCustomEndpoint types.String `tfsdk:"postgresflex_custom_endpoint"`
|
PostgresFlexCustomEndpoint types.String `tfsdk:"postgresflex_custom_endpoint"`
|
||||||
MongoDBFlexCustomEndpoint types.String `tfsdk:"mongodbflex_custom_endpoint"`
|
MongoDBFlexCustomEndpoint types.String `tfsdk:"mongodbflex_custom_endpoint"`
|
||||||
LoadBalancerCustomEndpoint types.String `tfsdk:"loadbalancer_custom_endpoint"`
|
LoadBalancerCustomEndpoint types.String `tfsdk:"loadbalancer_custom_endpoint"`
|
||||||
|
|
@ -138,7 +137,6 @@ func (p *Provider) Schema(_ context.Context, _ provider.SchemaRequest, resp *pro
|
||||||
"objectstorage_custom_endpoint": "Custom endpoint for the Object Storage service",
|
"objectstorage_custom_endpoint": "Custom endpoint for the Object Storage service",
|
||||||
"observability_custom_endpoint": "Custom endpoint for the Observability service",
|
"observability_custom_endpoint": "Custom endpoint for the Observability service",
|
||||||
"opensearch_custom_endpoint": "Custom endpoint for the OpenSearch service",
|
"opensearch_custom_endpoint": "Custom endpoint for the OpenSearch service",
|
||||||
"postgresql_custom_endpoint": "Custom endpoint for the PostgreSQL service",
|
|
||||||
"postgresflex_custom_endpoint": "Custom endpoint for the PostgresFlex service",
|
"postgresflex_custom_endpoint": "Custom endpoint for the PostgresFlex service",
|
||||||
"redis_custom_endpoint": "Custom endpoint for the Redis service",
|
"redis_custom_endpoint": "Custom endpoint for the Redis service",
|
||||||
"server_backup_custom_endpoint": "Custom endpoint for the Server Backup service",
|
"server_backup_custom_endpoint": "Custom endpoint for the Server Backup service",
|
||||||
|
|
@ -198,10 +196,6 @@ func (p *Provider) Schema(_ context.Context, _ provider.SchemaRequest, resp *pro
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Description: descriptions["iaas_custom_endpoint"],
|
Description: descriptions["iaas_custom_endpoint"],
|
||||||
},
|
},
|
||||||
"postgresql_custom_endpoint": schema.StringAttribute{
|
|
||||||
Optional: true,
|
|
||||||
Description: descriptions["postgresql_custom_endpoint"],
|
|
||||||
},
|
|
||||||
"postgresflex_custom_endpoint": schema.StringAttribute{
|
"postgresflex_custom_endpoint": schema.StringAttribute{
|
||||||
Optional: true,
|
Optional: true,
|
||||||
Description: descriptions["postgresflex_custom_endpoint"],
|
Description: descriptions["postgresflex_custom_endpoint"],
|
||||||
|
|
@ -329,9 +323,6 @@ func (p *Provider) Configure(ctx context.Context, req provider.ConfigureRequest,
|
||||||
if !(providerConfig.IaaSCustomEndpoint.IsUnknown() || providerConfig.IaaSCustomEndpoint.IsNull()) {
|
if !(providerConfig.IaaSCustomEndpoint.IsUnknown() || providerConfig.IaaSCustomEndpoint.IsNull()) {
|
||||||
providerData.IaaSCustomEndpoint = providerConfig.IaaSCustomEndpoint.ValueString()
|
providerData.IaaSCustomEndpoint = providerConfig.IaaSCustomEndpoint.ValueString()
|
||||||
}
|
}
|
||||||
if !(providerConfig.PostgreSQLCustomEndpoint.IsUnknown() || providerConfig.PostgreSQLCustomEndpoint.IsNull()) {
|
|
||||||
providerData.PostgreSQLCustomEndpoint = providerConfig.PostgreSQLCustomEndpoint.ValueString()
|
|
||||||
}
|
|
||||||
if !(providerConfig.PostgresFlexCustomEndpoint.IsUnknown() || providerConfig.PostgresFlexCustomEndpoint.IsNull()) {
|
if !(providerConfig.PostgresFlexCustomEndpoint.IsUnknown() || providerConfig.PostgresFlexCustomEndpoint.IsNull()) {
|
||||||
providerData.PostgresFlexCustomEndpoint = providerConfig.PostgresFlexCustomEndpoint.ValueString()
|
providerData.PostgresFlexCustomEndpoint = providerConfig.PostgresFlexCustomEndpoint.ValueString()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue