Skip to content

Commit

Permalink
chore(service): rename connection_info field to connection_uri (#1459)
Browse files Browse the repository at this point in the history
  • Loading branch information
Serpentiel authored Nov 27, 2023
1 parent 1614ae6 commit 601b7f4
Show file tree
Hide file tree
Showing 30 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ nav_order: 1
- Add `emit_backward_heartbeats_enabled` field support in Mirrormaker replication flow
- Add validation for email fields in `account_team_member`, `organization_user` and `project_user` resources to check
if email is lowercase and valid
- Add `connection_info` field to components of all services. This field contains connection information for the
- Add `connection_uri` field to components of all services. This field contains connection information for the
component, and is a combination of the `host` and `port` fields
- Add `external_postgresql` and `external_google_cloud_bigquery` service integration endpoints

Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/cassandra.md
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Read-Only:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/clickhouse.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Read-Only:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/flink.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_flink" "flink" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/grafana.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_grafana" "gr1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/influxdb.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_influxdb" "inf1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/kafka.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ data "aiven_kafka" "kafka1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/kafka_connect.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_kafka_connect" "kc1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/kafka_mirrormaker.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_kafka_mirrormaker" "mm1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/m3aggregator.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_m3aggregator" "m3a" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/m3db.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_m3db" "m3" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/mysql.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_mysql" "mysql1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/opensearch.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_opensearch" "os1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/pg.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_pg" "pg" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/data-sources/redis.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ data "aiven_redis" "redis1" {
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/cassandra.md
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ Read-Only:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/clickhouse.md
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Read-Only:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/flink.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/grafana.md
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/influxdb.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/kafka.md
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/kafka_connect.md
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/kafka_mirrormaker.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/m3aggregator.md
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/m3db.md
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/mysql.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/opensearch.md
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/pg.md
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
2 changes: 1 addition & 1 deletion docs/resources/redis.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ Optional:
Read-Only:

- `component` (String)
- `connection_info` (String)
- `connection_uri` (String)
- `host` (String)
- `kafka_authentication_method` (String)
- `port` (Number)
Expand Down
4 changes: 2 additions & 2 deletions internal/schemautil/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ func ServiceCommonSchema() map[string]*schema.Schema {
Computed: true,
Description: "Port number for connecting to the service component",
},
"connection_info": {
"connection_uri": {
Type: schema.TypeString,
Computed: true,
Description: "Connection info for connecting to the service component." +
Expand Down Expand Up @@ -750,7 +750,7 @@ func FlattenServiceComponents(r *aiven.Service) []map[string]interface{} {
"component": c.Component,
"host": c.Host,
"port": c.Port,
"connection_info": fmt.Sprintf("%s:%d", c.Host, c.Port),
"connection_uri": fmt.Sprintf("%s:%d", c.Host, c.Port),
"kafka_authentication_method": c.KafkaAuthenticationMethod,
"route": c.Route,
// By default, endpoints are always encrypted and
Expand Down

0 comments on commit 601b7f4

Please sign in to comment.