Merge pull request #126 from srinandan/minimal

Return Minimal fields

Author: srinandan

client/connections/connectors.go

@@ -331,14 +331,41 @@ func Delete(name string) (respBody []byte, err error) {
 }
 
 // Get
-func Get(name string, view string) (respBody []byte, err error) {
+func Get(name string, view string, minimal bool) (respBody []byte, err error) {
 	u, _ := url.Parse(apiclient.GetBaseConnectorURL())
 	q := u.Query()
 	if view != "" {
 		q.Set("view", view)
 	}
 	u.Path = path.Join(u.Path, name)
+
+	tmp := apiclient.GetPrintOutput()
+
+	if minimal {
+		apiclient.SetPrintOutput(false)
+	}
+
 	respBody, err = apiclient.HttpClient(apiclient.GetPrintOutput(), u.String())
+
+	if minimal {
+		c := connection{}
+		err := json.Unmarshal(respBody, &c)
+		if err != nil {
+			return nil, err
+		}
+		c.ConnectorDetails = new(connectorDetails)
+		c.ConnectorDetails.Name = getConnectorName(*c.ConnectorVersion)
+		c.ConnectorDetails.Version = getConnectorVersion(*c.ConnectorVersion)
+		c.ConnectorVersion = nil
+		c.Name = nil
+		connectionPayload, err := json.Marshal(c)
+		if err != nil {
+			return nil, err
+		}
+		apiclient.SetPrintOutput(tmp) //set original print output
+		apiclient.PrettyPrint(connectionPayload)
+		return connectionPayload, err
+	}
 	return respBody, err
 }
 
@@ -419,7 +446,7 @@ func Import(folder string) (err error) {
 			return err
 		}
 
-		if _, err := Get(name, ""); err != nil { //create only if connection doesn't exist
+		if _, err := Get(name, "", false); err != nil { //create only if connection doesn't exist
 			_, err = Create(name, content, "", "", "", false)
 			if err != nil {
 				errs = append(errs, err.Error())

client/integrations/integrations.go

@@ -432,7 +432,7 @@ func List(pageSize int, pageToken string, filter string, orderBy string) (respBo
 }
 
 // Get
-func Get(name string, version string, basicInfo bool, override bool) ([]byte, error) {
+func Get(name string, version string, basicInfo bool, minimal bool, override bool) ([]byte, error) {
 	u, _ := url.Parse(apiclient.GetBaseIntegrationURL())
 	u.Path = path.Join(u.Path, "integrations", name, "versions", version)
 	if basicInfo {
@@ -448,25 +448,50 @@ func Get(name string, version string, basicInfo bool, override bool) ([]byte, er
 		apiclient.SetPrintOutput(printSetting)
 		return getBasicInfo(respBody)
 	}
-	apiclient.SetPrintOutput(!override)
+
+	tmp := apiclient.GetPrintOutput()
+
+	if override || minimal {
+		apiclient.SetPrintOutput(false)
+	}
+
 	respBody, err := apiclient.HttpClient(apiclient.GetPrintOutput(), u.String())
+
+	if minimal {
+		iversion := integrationVersion{}
+		err = json.Unmarshal(respBody, &iversion)
+		if err != nil {
+			return nil, err
+		}
+
+		eversion := convertInternalToExternal(iversion)
+		respBody, err = json.Marshal(eversion)
+		apiclient.SetPrintOutput(tmp)
+		apiclient.PrettyPrint(respBody)
+	}
+
 	if override {
 		iversion := integrationVersion{}
-		json.Unmarshal(respBody, &iversion)
+		err = json.Unmarshal(respBody, &iversion)
+		if err != nil {
+			return nil, err
+		}
+
 		or := overrides{}
 		if or, err = extractOverrides(iversion); err != nil {
 			return nil, err
 		}
 		if respBody, err = json.Marshal(or); err != nil {
 			return nil, err
 		}
+		apiclient.SetPrintOutput(tmp)
 		apiclient.PrettyPrint(respBody)
 	}
 	return respBody, err
 }
 
 // GetBySnapshot
-func GetBySnapshot(name string, snapshot string, override bool) ([]byte, error) {
+func GetBySnapshot(name string, snapshot string, minimal bool, override bool) ([]byte, error) {
 	apiclient.SetPrintOutput(false)
 	listBody, err := ListVersions(name, -1, "", "snapshotNumber="+snapshot, "", false, false, true)
 	if err != nil {
@@ -485,11 +510,11 @@ func GetBySnapshot(name string, snapshot string, override bool) ([]byte, error)
 	}
 
 	version := getVersion(listBasicVersions.BasicIntegrationVersions[0].Version)
-	return Get(name, version, false, override)
+	return Get(name, version, false, minimal, override)
 }
 
 // GetByUserlabel
-func GetByUserlabel(name string, userLabel string, override bool) ([]byte, error) {
+func GetByUserlabel(name string, userLabel string, minimal bool, override bool) ([]byte, error) {
 	apiclient.SetPrintOutput(false)
 	listBody, err := ListVersions(name, -1, "", "userLabel="+userLabel, "", false, false, true)
 	if err != nil {
@@ -507,7 +532,7 @@ func GetByUserlabel(name string, userLabel string, override bool) ([]byte, error
 	}
 
 	version := getVersion(listBasicVersions.BasicIntegrationVersions[0].Version)
-	return Get(name, version, false, override)
+	return Get(name, version, false, minimal, override)
 }
 
 // Delete - THIS IS UNIMPLEMENTED!!!

client/integrations/overrides.go

@@ -295,7 +295,7 @@ func getNewConnectionParams(connectionName string, connectionLocation string) (c
 		integrationRegion = apiclient.GetRegion() //store the integration location
 		apiclient.SetRegion(connectionLocation)   //set the connector region
 	}
-	connResp, err := connections.Get(connectionName, "BASIC") //get connector details
+	connResp, err := connections.Get(connectionName, "BASIC", false) //get connector details
 	apiclient.SetPrintOutput(true)
 	if connectionLocation != "" {
 		apiclient.SetRegion(integrationRegion) //set the integration region back

cmd/connectors/get.go

@@ -38,18 +38,21 @@ var GetCmd = &cobra.Command{
 		return apiclient.SetProjectID(project)
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
-		_, err = connections.Get(name, view)
+		_, err = connections.Get(name, view, minimal)
 		return
 	},
 }
 
 var view string
+var minimal bool
 
 func init() {
 	GetCmd.Flags().StringVarP(&name, "name", "n",
 		"", "The name of the connection")
 	GetCmd.Flags().StringVarP(&view, "view", "",
 		"BASIC", "fields of the Connection to be returned; default is BASIC. FULL is the other option")
+	GetCmd.Flags().BoolVarP(&minimal, "minimal", "",
+		false, "fields of the Connection to be returned; default is false")
 
 	_ = GetCmd.MarkFlagRequired("name")
 }

cmd/integrations/getversion.go

@@ -48,17 +48,19 @@ var GetVerCmd = &cobra.Command{
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if version != "" {
-			_, err = integrations.Get(name, version, basic, overrides)
+			_, err = integrations.Get(name, version, basic, minimal, overrides)
 		} else if snapshot != "" {
-			_, err = integrations.GetBySnapshot(name, snapshot, overrides)
+			_, err = integrations.GetBySnapshot(name, snapshot, minimal, overrides)
 		} else {
-			_, err = integrations.GetByUserlabel(name, userLabel, overrides)
+			_, err = integrations.GetByUserlabel(name, userLabel, minimal, overrides)
 		}
 		return
 
 	},
 }
 
+var minimal bool
+
 func init() {
 	GetVerCmd.Flags().StringVarP(&name, "name", "n",
 		"", "Integration flow name")
@@ -72,6 +74,8 @@ func init() {
 		false, "Returns snapshot and version only")
 	GetVerCmd.Flags().BoolVarP(&overrides, "overrides", "o",
 		false, "Returns overrides only for integration")
+	GetVerCmd.Flags().BoolVarP(&minimal, "minimal", "",
+		false, "fields of the Integration to be returned; default is false")
 
 	_ = GetVerCmd.MarkFlagRequired("name")
 }