chore: do not require remoteOrgID for remote creation

influxdata · Oct 25, 2022 · c9ed697 · c9ed697
1 parent e23b6f0
commit c9ed697
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/clients/remote/remote.go b/clients/remote/remote.go
@@ -44,13 +44,18 @@ func (c Client) Create(ctx context.Context, params *CreateParams) error {
 		OrgID:            orgID,
 		RemoteURL:        params.RemoteURL,
 		RemoteAPIToken:   params.RemoteAPIToken,
-		RemoteOrgID:      params.RemoteOrgID,
 		AllowInsecureTLS: params.AllowInsecureTLS,
 	}
 
 	if params.Description != "" {
 		body.Description = &params.Description
 	}
+	if params.RemoteOrgID != "" {
+		body.RemoteOrgID = &params.RemoteOrgID
+	} else {
+		fmt.Fprintln(c.StdIO, "RemoteOrgID is required for remote connections to Cloud or OSS 2.x!")
+		fmt.Fprintln(c.StdIO, "Ignore this message if this remote connection is to a 1.x instance")
+	}
 
 	// send post request
 	res, err := c.PostRemoteConnection(ctx).RemoteConnectionCreationRequest(body).Execute()
@@ -215,7 +220,7 @@ func (c Client) printRemote(opts printRemoteOpts) error {
 			"Name":               r.GetName(),
 			"Org ID":             r.OrgID,
 			"Remote URL":         r.RemoteURL,
-			"Remote Org ID":      r.RemoteOrgID,
+			"Remote Org ID":      r.GetRemoteOrgID(),
 			"Allow Insecure TLS": r.AllowInsecureTLS,
 		}
 		if opts.deleted {

diff --git a/cmd/influx/remote.go b/cmd/influx/remote.go
@@ -57,7 +57,6 @@ func newRemoteCreateCmd() cli.Command {
 			&cli.StringFlag{
 				Name:        "remote-org-id",
 				Usage:       "The ID of the remote organization",
-				Required:    true,
 				Destination: &params.RemoteOrgID,
 			},
 			&cli.BoolFlag{