fix: do not require remoteOrgID in remote config/creation request (#2…

…3838)
influxdata · Nov 1, 2022 · 6fc66ac · 6fc66ac
1 parent 8c23f92
commit 6fc66ac
Show file tree

Hide file tree

Showing 14 changed files with 251 additions and 62 deletions.
diff --git a/cmd/influxd/downgrade/downgrade.go b/cmd/influxd/downgrade/downgrade.go
@@ -37,6 +37,7 @@ var downgradeMigrationTargets = map[string]migrationTarget{
 	"2.0": {kvMigration: 15, sqlMigration: 0},
 	"2.1": {kvMigration: 18, sqlMigration: 3},
 	"2.3": {kvMigration: 20, sqlMigration: 5},
+	"2.4": {kvMigration: 20, sqlMigration: 7},
 }
 
 func NewCommand(ctx context.Context, v *viper.Viper) (*cobra.Command, error) {

diff --git a/cmd/influxd/launcher/replication_test.go b/cmd/influxd/launcher/replication_test.go
@@ -33,7 +33,7 @@ func TestValidateReplication_Valid(t *testing.T) {
 			OrgID:            l.Org.ID.String(),
 			RemoteURL:        l.URL().String(),
 			RemoteAPIToken:   l.Auth.Token,
-			RemoteOrgID:      l.Org.ID.String(),
+			RemoteOrgID:      api.PtrString(l.Org.ID.String()),
 			AllowInsecureTLS: false,
 		}).Execute()
 	require.NoError(t, err)
@@ -44,7 +44,7 @@ func TestValidateReplication_Valid(t *testing.T) {
 		OrgID:             l.Org.ID.String(),
 		RemoteID:          remote.Id,
 		LocalBucketID:     l.Bucket.ID.String(),
-		RemoteBucketID:    l.Bucket.ID.String(),
+		RemoteBucketID:    api.PtrString(l.Bucket.ID.String()),
 		MaxQueueSizeBytes: influxdb.DefaultReplicationMaxQueueSizeBytes,
 	}
 	_, err = client.ReplicationsApi.PostReplication(ctx).ReplicationCreationRequest(createReq).Validate(true).Execute()
@@ -97,7 +97,7 @@ func TestValidateReplication_Invalid(t *testing.T) {
 			OrgID:            l.Org.ID.String(),
 			RemoteURL:        l.URL().String(),
 			RemoteAPIToken:   "foo",
-			RemoteOrgID:      l.Org.ID.String(),
+			RemoteOrgID:      api.PtrString(l.Org.ID.String()),
 			AllowInsecureTLS: false,
 		}).Execute()
 	require.NoError(t, err)
@@ -109,7 +109,7 @@ func TestValidateReplication_Invalid(t *testing.T) {
 		OrgID:             l.Org.ID.String(),
 		RemoteID:          remote.Id,
 		LocalBucketID:     l.Bucket.ID.String(),
-		RemoteBucketID:    l.Bucket.ID.String(),
+		RemoteBucketID:    api.PtrString(l.Bucket.ID.String()),
 		MaxQueueSizeBytes: influxdb.DefaultReplicationMaxQueueSizeBytes,
 	}
 	_, err = client.ReplicationsApi.PostReplication(ctx).ReplicationCreationRequest(createReq).Validate(true).Execute()
@@ -233,7 +233,7 @@ csv.from(csv: csvData) |> to(bucket: %q)
 			OrgID:            l.Org.ID.String(),
 			RemoteURL:        proxy.URL,
 			RemoteAPIToken:   l.Auth.Token,
-			RemoteOrgID:      l.Org.ID.String(),
+			RemoteOrgID:      api.PtrString(l.Org.ID.String()),
 			AllowInsecureTLS: false,
 		}).Execute()
 	require.NoError(t, err)
@@ -257,7 +257,7 @@ csv.from(csv: csvData) |> to(bucket: %q)
 		OrgID:             l.Org.ID.String(),
 		RemoteID:          remote.Id,
 		LocalBucketID:     l.Bucket.ID.String(),
-		RemoteBucketID:    remote1Bucket.ID.String(),
+		RemoteBucketID:    api.PtrString(remote1Bucket.ID.String()),
 		MaxQueueSizeBytes: influxdb.DefaultReplicationMaxQueueSizeBytes,
 		MaxAgeSeconds:     influxdb.DefaultReplicationMaxAge,
 	}
@@ -284,7 +284,7 @@ csv.from(csv: csvData) |> to(bucket: %q)
 		OrgID:             l.Org.ID.String(),
 		RemoteID:          remote.Id,
 		LocalBucketID:     l.Bucket.ID.String(),
-		RemoteBucketID:    remote2Bucket.ID.String(),
+		RemoteBucketID:    api.PtrString(remote2Bucket.ID.String()),
 		MaxQueueSizeBytes: influxdb.DefaultReplicationMaxQueueSizeBytes,
 		MaxAgeSeconds:     influxdb.DefaultReplicationMaxAge,
 	}
@@ -378,7 +378,7 @@ func TestReplicationStreamEndToEndRemoteFailures(t *testing.T) {
 			OrgID:            l.Org.ID.String(),
 			RemoteURL:        proxy.URL,
 			RemoteAPIToken:   l.Auth.Token,
-			RemoteOrgID:      l.Org.ID.String(),
+			RemoteOrgID:      api.PtrString(l.Org.ID.String()),
 			AllowInsecureTLS: false,
 		}).Execute()
 	require.NoError(t, err)
@@ -397,7 +397,7 @@ func TestReplicationStreamEndToEndRemoteFailures(t *testing.T) {
 		OrgID:             l.Org.ID.String(),
 		RemoteID:          remote.Id,
 		LocalBucketID:     l.Bucket.ID.String(),
-		RemoteBucketID:    remoteBucket.ID.String(),
+		RemoteBucketID:    api.PtrString(remoteBucket.ID.String()),
 		MaxQueueSizeBytes: influxdb.DefaultReplicationMaxQueueSizeBytes,
 		MaxAgeSeconds:     influxdb.DefaultReplicationMaxAge,
 	}
@@ -434,7 +434,7 @@ func TestReplicationsLocalWriteAndShutdownBlocking(t *testing.T) {
 			OrgID:            l.Org.ID.String(),
 			RemoteURL:        svr.URL,
 			RemoteAPIToken:   "foo",
-			RemoteOrgID:      l.Org.ID.String(),
+			RemoteOrgID:      api.PtrString(l.Org.ID.String()),
 			AllowInsecureTLS: false,
 		}).Execute()
 	require.NoError(t, err)
@@ -444,7 +444,7 @@ func TestReplicationsLocalWriteAndShutdownBlocking(t *testing.T) {
 		OrgID:             l.Org.ID.String(),
 		RemoteID:          remote.Id,
 		LocalBucketID:     l.Bucket.ID.String(),
-		RemoteBucketID:    l.Bucket.ID.String(),
+		RemoteBucketID:    api.PtrString(l.Bucket.ID.String()),
 		MaxQueueSizeBytes: influxdb.DefaultReplicationMaxQueueSizeBytes,
 	}
 

diff --git a/go.mod b/go.mod
@@ -31,7 +31,7 @@ require (
 	github.com/influxdata/cron v0.0.0-20201006132531-4bb0a200dcbe
 	github.com/influxdata/flux v0.188.1
 	github.com/influxdata/httprouter v1.3.1-0.20191122104820-ee83e2772f69
-	github.com/influxdata/influx-cli/v2 v2.2.1-0.20220318222112-88ba3464cd07
+	github.com/influxdata/influx-cli/v2 v2.2.1-0.20221028161653-3285a03e9e28
 	github.com/influxdata/influxql v1.1.1-0.20211004132434-7e7d61973256
 	github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839
 	github.com/influxdata/pkg-config v0.2.11
@@ -65,7 +65,7 @@ require (
 	go.uber.org/zap v1.16.0
 	golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
 	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
-	golang.org/x/sys v0.0.0-20220412211240-33da011f77ad
+	golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a
 	golang.org/x/text v0.3.7
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	golang.org/x/tools v0.1.11-0.20220316014157-77aa08bb151a
@@ -79,7 +79,7 @@ require (
 	cloud.google.com/go v0.82.0 // indirect
 	cloud.google.com/go/bigquery v1.8.0 // indirect
 	cloud.google.com/go/bigtable v1.10.1 // indirect
-	github.com/AlecAivazis/survey/v2 v2.2.9 // indirect
+	github.com/AlecAivazis/survey/v2 v2.3.4 // indirect
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
 	github.com/Azure/azure-storage-blob-go v0.14.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -163,7 +163,7 @@ require (
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/lib/pq v1.2.0 // indirect
 	github.com/magiconair/properties v1.8.1 // indirect
-	github.com/mattn/go-colorable v0.1.9 // indirect
+	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
@@ -203,7 +203,7 @@ require (
 	golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
 	golang.org/x/net v0.0.0-20220401154927-543a649e0bdd // indirect
 	golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
-	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
 	golang.org/x/xerrors v0.0.0-20220411194840-2f41105eb62f // indirect
 	gonum.org/v1/gonum v0.11.0 // indirect
 	google.golang.org/api v0.47.0 // indirect