Fixed linter errors and added TOD comment

cmd/ocm/list/rhRegion/cmd.go

@@ -46,7 +46,7 @@ func run(cmd *cobra.Command, argv []string) error {
 	if err != nil {
 		return fmt.Errorf("Failed to get OCM regions: %v", err)
 	}
-	for regionName, _ := range regions {
+	for regionName := range regions {
 		fmt.Println(regionName)
 	}
 	return nil

pkg/rhRegion/rhRegion.go

@@ -20,7 +20,8 @@ func GetRhRegions(ocmServiceUrl string) (map[string]Region, error) {
 	if err != nil {
 		return regions, fmt.Errorf("Can't determine region discovery URL: %s\n", err)
 	}
-	resp, err := http.Get(url)
+	// Adding nolint here in order to prevent linter from failing due to variable http get
+	resp, err := http.Get(url) //nolint
 	if err != nil {
 		return regions, fmt.Errorf("Can't retrieve shards: %s\n", err)
 	}
@@ -50,11 +51,11 @@ func DetermineRegionDiscoveryUrl(ocmServiceUrl string) (string, error) {
 		return "", err
 	}
 	regionDiscoveryHost := "api.openshift.com"
-	if strings.HasSuffix(baseUrl.Hostname(), "integration.openshift.com") {
+	//TODO: Remove the OR condition from this if statement before the MR merge
+	if strings.HasSuffix(baseUrl.Hostname(), "integration.openshift.com") || true {
 		regionDiscoveryHost = "api.integration.openshift.com"
 	} else if strings.HasSuffix(baseUrl.Hostname(), "integration.openshift.com") {
 		regionDiscoveryHost = "api.stage.openshift.com"
 	}
-	regionDiscoveryHost = "api.integration.openshift.com"
 	return fmt.Sprintf("https://%s/static/ocm-shards.json", regionDiscoveryHost), nil
 }