[CLI] fix org repo create

deepflowio · May 23, 2024 · 47f7432 · 47f7432
1 parent d0c9575
commit 47f7432
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/cli/ctl/agent_repo.go b/cli/ctl/agent_repo.go
@@ -175,13 +175,15 @@ func createRepoAgent(cmd *cobra.Command, arch, image, versionImage, k8sImage str
 
 	server := common.GetServerInfo(cmd)
 	url := fmt.Sprintf("http://%s:%d/v1/vtap-repo/", server.IP, server.Port)
-	resp, err := common.CURLPostFormData(url, contentType, bodyBuf, []common.HTTPOption{common.WithTimeout(common.GetTimeout(cmd)), common.WithORGID(common.GetORGID(cmd))}...)
+	orgID := common.GetORGID(cmd)
+	resp, err := common.CURLPostFormData(url, contentType, bodyBuf, []common.HTTPOption{common.WithTimeout(common.GetTimeout(cmd)), common.WithORGID(orgID)}...)
 	if err != nil {
 		return err
 	}
 	data := resp.Get("DATA")
-	fmt.Printf("created successfully, os: %s, branch: %s, rev_count: %s, commit_id: %s\n", data.Get("OS").MustString(),
-		data.Get("BRANCH").MustString(), data.Get("REV_COUNT").MustString(), data.Get("COMMIT_ID").MustString())
+	fmt.Printf("ORGID-%d: created successfully, os: %s, branch: %s, rev_count: %s, commit_id: %s\n",
+		orgID, data.Get("OS").MustString(), data.Get("BRANCH").MustString(),
+		data.Get("REV_COUNT").MustString(), data.Get("COMMIT_ID").MustString())
 	return nil
 }
 

diff --git a/cli/ctl/common/http_util.go b/cli/ctl/common/http_util.go
@@ -135,6 +135,9 @@ func CURLPostFormData(url, contentType string, body *bytes.Buffer, opts ...HTTPO
 	if err != nil {
 		return nil, err
 	}
+	if cfg.ORGID != 0 {
+		req.Header.Set(ctrlcommon.HEADER_KEY_X_ORG_ID, strconv.Itoa(cfg.ORGID))
+	}
 	req.Header.Set("Content-Type", contentType)
 	req.Header.Set("Accept", "application/json, text/plain")
 	req.Header.Set("X-User-Id", "1")