From 049a69dedf0c846f4560e0360581beb535b1fcfa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 12:47:13 +0000 Subject: [PATCH] build(deps): bump github.com/aiven/go-api-schemas from 1.55.0 to 1.56.0 (#1553) --- go.mod | 2 +- go.sum | 4 +- .../userconfig/dist/service_types.go | 279 ++++++++++++++++++ 3 files changed, 282 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 435c34e57..567902f8b 100644 --- a/go.mod +++ b/go.mod @@ -45,7 +45,7 @@ require ( cloud.google.com/go v0.110.8 // indirect cloud.google.com/go/storage v1.30.1 // indirect github.com/agext/levenshtein v1.2.3 // indirect - github.com/aiven/go-api-schemas v1.55.0 + github.com/aiven/go-api-schemas v1.56.0 github.com/aws/aws-sdk-go v1.44.122 // indirect github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/go.sum b/go.sum index a873f8d7f..9c3b1f351 100644 --- a/go.sum +++ b/go.sum @@ -199,8 +199,8 @@ github.com/agext/levenshtein v1.2.3 h1:YB2fHEn0UJagG8T1rrWknE3ZQzWM06O8AMAatNn7l github.com/agext/levenshtein v1.2.3/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558= github.com/aiven/aiven-go-client/v2 v2.12.0 h1:VxOfn61AtfLjy2B+DdXF2/7OHyyFZ1aQaIlE3TOyIsE= github.com/aiven/aiven-go-client/v2 v2.12.0/go.mod h1:x0xhzxWEKAwKv0xY5FvECiI6tesWshcPHvjwl0B/1SU= -github.com/aiven/go-api-schemas v1.55.0 h1:hGwfUoZjftcMQgZXo/IhJYcNPXOOQKaSkqVFIzUpTUw= -github.com/aiven/go-api-schemas v1.55.0/go.mod h1:/bPxBUHza/2Aeer6hIIdB++GxKiw9K1KCBtRa2rtZ5I= +github.com/aiven/go-api-schemas v1.56.0 h1:sUYu6WeHnfgUfG+puON42C5j45di8zXy8L0KhI1YBSE= +github.com/aiven/go-api-schemas v1.56.0/go.mod h1:/bPxBUHza/2Aeer6hIIdB++GxKiw9K1KCBtRa2rtZ5I= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM= github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk= diff --git a/internal/schemautil/userconfig/dist/service_types.go b/internal/schemautil/userconfig/dist/service_types.go index 303355649..cf3f0329d 100644 --- a/internal/schemautil/userconfig/dist/service_types.go +++ b/internal/schemautil/userconfig/dist/service_types.go @@ -425,6 +425,285 @@ func ServiceTypeClickhouse() *schema.Schema { } } +// ServiceTypeDragonfly is a generated function returning the schema of the dragonfly ServiceType. +func ServiceTypeDragonfly() *schema.Schema { + s := map[string]*schema.Schema{ + "cache_mode": { + Default: false, + Description: "Evict entries when getting close to maxmemory limit. The default value is `false`.", + Optional: true, + Type: schema.TypeBool, + }, + "dragonfly_ssl": { + Default: true, + Description: "Require SSL to access Dragonfly. The default value is `true`.", + Optional: true, + Type: schema.TypeBool, + }, + "ip_filter": { + Deprecated: "This will be removed in v5.0.0 and replaced with ip_filter_string instead.", + Description: "Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'.", + DiffSuppressFunc: schemautil.IPFilterArrayDiffSuppressFunc, + Elem: &schema.Schema{ + DiffSuppressFunc: schemautil.IPFilterValueDiffSuppressFunc, + Type: schema.TypeString, + }, + MaxItems: 1024, + Optional: true, + Type: schema.TypeList, + }, + "ip_filter_object": { + Description: "Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'.", + Elem: &schema.Resource{Schema: map[string]*schema.Schema{ + "description": { + Description: "Description for IP filter list entry.", + Optional: true, + Type: schema.TypeString, + }, + "network": { + Description: "CIDR address block.", + Required: true, + Type: schema.TypeString, + }, + }}, + MaxItems: 1024, + Optional: true, + Type: schema.TypeList, + }, + "ip_filter_string": { + Description: "Allow incoming connections from CIDR address block, e.g. '10.20.0.0/16'.", + DiffSuppressFunc: schemautil.IPFilterArrayDiffSuppressFunc, + Elem: &schema.Schema{ + DiffSuppressFunc: schemautil.IPFilterValueDiffSuppressFunc, + Type: schema.TypeString, + }, + MaxItems: 1024, + Optional: true, + Type: schema.TypeList, + }, + "migration": { + Description: "Migrate data from existing server.", + DiffSuppressFunc: schemautil.EmptyObjectDiffSuppressFuncSkipArrays(map[string]*schema.Schema{ + "dbname": { + Description: "Database name for bootstrapping the initial connection.", + Optional: true, + Type: schema.TypeString, + }, + "host": { + Description: "Hostname or IP address of the server where to migrate data from.", + Required: true, + Type: schema.TypeString, + }, + "ignore_dbs": { + Description: "Comma-separated list of databases, which should be ignored during migration (supported by MySQL and PostgreSQL only at the moment).", + Optional: true, + Type: schema.TypeString, + }, + "method": { + Description: "The migration method to be used (currently supported only by Redis, Dragonfly, MySQL and PostgreSQL service types).", + Optional: true, + Type: schema.TypeString, + }, + "password": { + Description: "Password for authentication with the server where to migrate data from.", + Optional: true, + Sensitive: true, + Type: schema.TypeString, + }, + "port": { + Description: "Port number of the server where to migrate data from.", + Required: true, + Type: schema.TypeInt, + }, + "ssl": { + Default: true, + Description: "The server where to migrate data from is secured with SSL. The default value is `true`.", + Optional: true, + Type: schema.TypeBool, + }, + "username": { + Description: "User name for authentication with the server where to migrate data from.", + Optional: true, + Type: schema.TypeString, + }, + }), + Elem: &schema.Resource{Schema: map[string]*schema.Schema{ + "dbname": { + Description: "Database name for bootstrapping the initial connection.", + Optional: true, + Type: schema.TypeString, + }, + "host": { + Description: "Hostname or IP address of the server where to migrate data from.", + Required: true, + Type: schema.TypeString, + }, + "ignore_dbs": { + Description: "Comma-separated list of databases, which should be ignored during migration (supported by MySQL and PostgreSQL only at the moment).", + Optional: true, + Type: schema.TypeString, + }, + "method": { + Description: "The migration method to be used (currently supported only by Redis, Dragonfly, MySQL and PostgreSQL service types).", + Optional: true, + Type: schema.TypeString, + }, + "password": { + Description: "Password for authentication with the server where to migrate data from.", + Optional: true, + Sensitive: true, + Type: schema.TypeString, + }, + "port": { + Description: "Port number of the server where to migrate data from.", + Required: true, + Type: schema.TypeInt, + }, + "ssl": { + Default: true, + Description: "The server where to migrate data from is secured with SSL. The default value is `true`.", + Optional: true, + Type: schema.TypeBool, + }, + "username": { + Description: "User name for authentication with the server where to migrate data from.", + Optional: true, + Type: schema.TypeString, + }, + }}, + MaxItems: 1, + Optional: true, + Type: schema.TypeList, + }, + "private_access": { + Description: "Allow access to selected service ports from private networks.", + DiffSuppressFunc: schemautil.EmptyObjectDiffSuppressFuncSkipArrays(map[string]*schema.Schema{ + "dragonfly": { + Description: "Allow clients to connect to dragonfly with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.", + Optional: true, + Type: schema.TypeBool, + }, + "prometheus": { + Description: "Allow clients to connect to prometheus with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.", + Optional: true, + Type: schema.TypeBool, + }, + }), + Elem: &schema.Resource{Schema: map[string]*schema.Schema{ + "dragonfly": { + Description: "Allow clients to connect to dragonfly with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.", + Optional: true, + Type: schema.TypeBool, + }, + "prometheus": { + Description: "Allow clients to connect to prometheus with a DNS name that always resolves to the service's private IP addresses. Only available in certain network locations.", + Optional: true, + Type: schema.TypeBool, + }, + }}, + MaxItems: 1, + Optional: true, + Type: schema.TypeList, + }, + "privatelink_access": { + Description: "Allow access to selected service components through Privatelink.", + DiffSuppressFunc: schemautil.EmptyObjectDiffSuppressFuncSkipArrays(map[string]*schema.Schema{ + "dragonfly": { + Description: "Enable dragonfly.", + Optional: true, + Type: schema.TypeBool, + }, + "prometheus": { + Description: "Enable prometheus.", + Optional: true, + Type: schema.TypeBool, + }, + }), + Elem: &schema.Resource{Schema: map[string]*schema.Schema{ + "dragonfly": { + Description: "Enable dragonfly.", + Optional: true, + Type: schema.TypeBool, + }, + "prometheus": { + Description: "Enable prometheus.", + Optional: true, + Type: schema.TypeBool, + }, + }}, + MaxItems: 1, + Optional: true, + Type: schema.TypeList, + }, + "project_to_fork_from": { + Description: "Name of another project to fork a service from. This has effect only when a new service is being created.", + ForceNew: true, + Optional: true, + Type: schema.TypeString, + }, + "public_access": { + Description: "Allow access to selected service ports from the public Internet.", + DiffSuppressFunc: schemautil.EmptyObjectDiffSuppressFuncSkipArrays(map[string]*schema.Schema{ + "dragonfly": { + Description: "Allow clients to connect to dragonfly from the public internet for service nodes that are in a project VPC or another type of private network.", + Optional: true, + Type: schema.TypeBool, + }, + "prometheus": { + Description: "Allow clients to connect to prometheus from the public internet for service nodes that are in a project VPC or another type of private network.", + Optional: true, + Type: schema.TypeBool, + }, + }), + Elem: &schema.Resource{Schema: map[string]*schema.Schema{ + "dragonfly": { + Description: "Allow clients to connect to dragonfly from the public internet for service nodes that are in a project VPC or another type of private network.", + Optional: true, + Type: schema.TypeBool, + }, + "prometheus": { + Description: "Allow clients to connect to prometheus from the public internet for service nodes that are in a project VPC or another type of private network.", + Optional: true, + Type: schema.TypeBool, + }, + }}, + MaxItems: 1, + Optional: true, + Type: schema.TypeList, + }, + "recovery_basebackup_name": { + Description: "Name of the basebackup to restore in forked service.", + Optional: true, + Type: schema.TypeString, + }, + "service_log": { + Description: "Store logs for the service so that they are available in the HTTP API and console.", + Optional: true, + Type: schema.TypeBool, + }, + "service_to_fork_from": { + Description: "Name of another service to fork from. This has effect only when a new service is being created.", + ForceNew: true, + Optional: true, + Type: schema.TypeString, + }, + "static_ips": { + Description: "Use static public IP addresses.", + Optional: true, + Type: schema.TypeBool, + }, + } + + return &schema.Schema{ + Description: "Dragonfly user configurable settings", + DiffSuppressFunc: schemautil.EmptyObjectDiffSuppressFuncSkipArrays(s), + Elem: &schema.Resource{Schema: s}, + MaxItems: 1, + Optional: true, + Type: schema.TypeList, + } +} + // ServiceTypeElasticsearch is a generated function returning the schema of the elasticsearch ServiceType. func ServiceTypeElasticsearch() *schema.Schema { s := map[string]*schema.Schema{