@@ -26,29 +26,29 @@ type manifestData struct {
2626}
2727
2828type data struct {
29- GetManifest string `json:"getManifest "`
29+ GetManifest string `json:"getInfraManifest "`
3030}
3131
32- type InfrasData struct {
33- Data GetInfraDetails `json:"data"`
32+ type GetInfraResponse struct {
33+ Data GetInfraData `json:"data"`
3434 Errors []struct {
3535 Message string `json:"message"`
3636 Path []string `json:"path"`
3737 } `json:"errors"`
3838}
3939
40- type GetInfraDetails struct {
41- GetInfraDetails InfrasDetails `json:"getAgentDetails "`
40+ type GetInfraData struct {
41+ GetInfraDetails InfraDetails `json:"getInfraDetails "`
4242}
4343
44- type InfrasDetails struct {
44+ type InfraDetails struct {
4545 InfraID string `json:"infraID"`
4646 InfraNamespace * string `json:"infraNamespace"`
4747}
4848
4949func UpgradeInfra (c context.Context , cred types.Credentials , projectID string , infraID string , kubeconfig string ) (string , error ) {
5050
51- // Query to fetch agent details from server
51+ // Query to fetch Infra details from server
5252 query := `{"query":"query {\n getInfraDetails(infraID : \"` + infraID + `\", \n projectID : \"` + projectID + `\"){\n infraNamespace infraID \n}}"}`
5353 resp , err := SendRequest (SendRequestParams {Endpoint : cred .Endpoint + utils .GQLAPIPath , Token : cred .Token }, []byte (query ), string (types .Post ))
5454 if err != nil {
@@ -61,7 +61,7 @@ func UpgradeInfra(c context.Context, cred types.Credentials, projectID string, i
6161 }
6262
6363 defer resp .Body .Close ()
64- var infra InfrasData
64+ var infra GetInfraResponse
6565
6666 if resp .StatusCode == http .StatusOK {
6767 err = json .Unmarshal (bodyBytes , & infra )
@@ -102,27 +102,27 @@ func UpgradeInfra(c context.Context, cred types.Credentials, projectID string, i
102102 }
103103
104104 // To write the manifest data into a temporary file
105- err = ioutil .WriteFile ("chaos-delegate -manifest.yaml" , []byte (manifest .Data .GetManifest ), 0644 )
105+ err = ioutil .WriteFile ("chaos-infra -manifest.yaml" , []byte (manifest .Data .GetManifest ), 0644 )
106106 if err != nil {
107107 return "" , err
108108 }
109109
110- // Fetching agent -config from the subscriber
111- configData , err := k8s .GetConfigMap (c , "agent -config" , * infra .Data .GetInfraDetails .InfraNamespace )
110+ // Fetching subscriber -config from the subscriber
111+ configData , err := k8s .GetConfigMap (c , "subscriber -config" , * infra .Data .GetInfraDetails .InfraNamespace )
112112 if err != nil {
113113 return "" , err
114114 }
115115 var configMapString string
116116
117117 metadata := new (bytes.Buffer )
118118 fmt .Fprintf (metadata , "\n %s: %s\n %s: %s\n %s: \n %s: %s\n %s: %s\n %s:\n " , "apiVersion" , "v1" ,
119- "kind" , "ConfigMap" , "metadata" , "name" , "agent -config" , "namespace" , * infra .Data .GetInfraDetails .InfraNamespace , "data" )
119+ "kind" , "ConfigMap" , "metadata" , "name" , "subscriber -config" , "namespace" , * infra .Data .GetInfraDetails .InfraNamespace , "data" )
120120
121121 for k , v := range configData {
122122 b := new (bytes.Buffer )
123123 if k == "COMPONENTS" {
124124 fmt .Fprintf (b , " %s: |\n %s" , k , v )
125- } else if k == "START_TIME" || k == "IS_CLUSTER_CONFIRMED " {
125+ } else if k == "START_TIME" || k == "IS_INFRA_CONFIRMED " {
126126 fmt .Fprintf (b , " %s: \" %s\" \n " , k , v )
127127 } else {
128128 fmt .Fprintf (b , " %s: %s\n " , k , v )
@@ -134,30 +134,30 @@ func UpgradeInfra(c context.Context, cred types.Credentials, projectID string, i
134134 yamlOutput , err := k8s .ApplyYaml (k8s.ApplyYamlPrams {
135135 Token : cred .Token ,
136136 Endpoint : cred .Endpoint ,
137- YamlPath : "chaos-delegate -manifest.yaml" ,
137+ YamlPath : "chaos-infra -manifest.yaml" ,
138138 }, kubeconfig , true )
139139
140140 if err != nil {
141141 return "" , err
142142 }
143143 utils .White .Print ("\n " , yamlOutput )
144144
145- err = os .Remove ("chaos-delegate -manifest.yaml" )
145+ err = os .Remove ("chaos-infra -manifest.yaml" )
146146 if err != nil {
147- return "Error removing Chaos Delegate manifest: " , err
147+ return "Error removing Chaos Infrastructure manifest: " , err
148148 }
149149
150- // Creating a backup for current agent -config in the SUBSCRIBER
150+ // Creating a backup for current subscriber -config in the SUBSCRIBER
151151 home , err := homedir .Dir ()
152152 cobra .CheckErr (err )
153153
154154 configMapString = metadata .String () + configMapString
155- err = ioutil .WriteFile (home + "/backupAgentConfig .yaml" , []byte (configMapString ), 0644 )
155+ err = ioutil .WriteFile (home + "/backupSubscriberConfig .yaml" , []byte (configMapString ), 0644 )
156156 if err != nil {
157- return "Error creating backup for agent config: " , err
157+ return "Error creating backup for subscriber config: " , err
158158 }
159159
160- utils .White_B .Print ("\n ** A backup of agent -config configmap has been saved in your system's home directory as backupAgentConfig .yaml **\n " )
160+ utils .White_B .Print ("\n ** A backup of subscriber -config configmap has been saved in your system's home directory as backupSubscriberConfig .yaml **\n " )
161161
162162 return "Manifest applied successfully" , nil
163163 } else {
0 commit comments