Merge pull request #31 from rightscale/support_eu

Support Flexera One EU and other fixes

client/policy/applied_policy.go

@@ -4,12 +4,15 @@ package policy
 
 import (
 	"context"
-	"github.com/pkg/errors"
-	"github.com/rightscale/policy_sdk/sdk/applied_policy"
-	goahttp "goa.design/goa/v3/http"
+	"encoding/json"
 	"io"
 	"io/ioutil"
 	"net/http"
+
+	"github.com/pkg/errors"
+	appliedpolicy "github.com/rightscale/policy_sdk/sdk/applied_policy"
+	apclient "github.com/rightscale/policy_sdk/sdk/http/applied_policy/client"
+	goahttp "goa.design/goa/v3/http"
 )
 
 // CreateAppliedPolicy an applied policy
@@ -150,11 +153,23 @@ func (d *showLogDecoder) Decode(v interface{}) error {
 		return err
 	}
 
-	s, ok := v.(*string)
-	if !ok {
-		return errors.Errorf("expected type to be string, got %T", v)
+	switch t := v.(type) {
+	case *string:
+		*t = string(bodyBytes)
+	case *apclient.ShowLogNotFoundResponseBody:
+		if len(bodyBytes) > 0 {
+			json.Unmarshal(bodyBytes, t)
+		} else {
+			t.Name = strPtr("not_found")
+			t.ID = strPtr("missing")
+			t.Message = strPtr("log not found")
+			t.Temporary = boolPtr(false)
+			t.Timeout = boolPtr(false)
+			t.Fault = boolPtr(false)
+		}
+	default:
+		json.Unmarshal(bodyBytes, t)
 	}
-	*s = string(bodyBytes)
 	return nil
 }
 

client/policy/policy_template.go

@@ -6,7 +6,7 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"github.com/rightscale/policy_sdk/sdk/policy_template"
+	policytemplate "github.com/rightscale/policy_sdk/sdk/policy_template"
 )
 
 // UploadPolicyTemplate a policy template
@@ -150,3 +150,4 @@ func (c *client) RetrieveData(ctx context.Context, templateID string, names []st
 }
 
 func strPtr(s string) *string { return &s }
+func boolPtr(b bool) *bool    { return &b }

cmd/fpt/ChangeLog.md

@@ -1,3 +1,10 @@
+v1.3.0 / 2021-03-01
+-------------------
+* Add support for Flexera One EU using `eu-central-1.policy-eu.flexeraeng.com` for the host configuration item
+* Display Flexera One URLs in `fpt run` out when using Flexera One EU or the refresh token is for Flexera One
+  instead of RightScale
+* Fix a bug where `fpt run` would hang trying to print the log after the policy execution completed
+
 v1.2.2 / 2021-01-15
 -------------------
 * Fix a bug in `fpt script` parameter parsing where non-numeric bare parameters came through as `nil` and numeric

cmd/fpt/run.go

@@ -9,8 +9,10 @@ import (
 	"time"
 
 	"github.com/pkg/errors"
+	goa "goa.design/goa/v3/pkg"
 
 	"github.com/rightscale/policy_sdk/client/policy"
+	"github.com/rightscale/policy_sdk/config"
 	appliedpolicy "github.com/rightscale/policy_sdk/sdk/applied_policy"
 	"github.com/rightscale/policy_sdk/sdk/incident"
 	policytemplate "github.com/rightscale/policy_sdk/sdk/policy_template"
@@ -96,19 +98,27 @@ func policyTemplateRun(ctx context.Context, cli policy.Client, file string, runO
 
 		log, logErr := cli.ShowAppliedPolicyLog(ctx, ap.ID, lastEtag)
 		if logErr != nil {
-			// Most logErrs are of the 304 Not Modified variety and can be ignored
-			continue
-		}
-		if *log.Etag == lastEtag {
-			continue
+			// technically the Goa client should not consider 304 an error
+			if strings.Contains(logErr.Error(), "invalid response code 304") {
+				goto checkStatus
+			}
+			// the log may not be available yet so we retry 404s
+			if gse, ok := logErr.(*goa.ServiceError); ok && gse.Name == "not_found" {
+				goto checkStatus
+			}
+			return logErr
 		}
-		lastSize := len(lastLog)
-		lastEtag = *log.Etag
-		lastLog = *log.ResponseBody
-		if !noLog {
-			fmt.Print(lastLog[lastSize:])
+
+		if *log.Etag != lastEtag {
+			lastSize := len(lastLog)
+			lastEtag = *log.Etag
+			lastLog = *log.ResponseBody
+			if !noLog {
+				fmt.Print(lastLog[lastSize:])
+			}
 		}
 
+	checkStatus:
 		//fmt.Printf("STATUS: %s\n", dump(status))
 		if status.LastEvaluationFinish != nil {
 			break
@@ -293,11 +303,21 @@ func dump(v interface{}) string {
 }
 
 func appliedPolicyUILink(ap *appliedpolicy.AppliedPolicy) string {
-	return fmt.Sprintf("https://governance.rightscale.com/org/%d/projects/%d/applied-policies/%s",
-		ap.Project.OrgID, ap.Project.ID, ap.ID)
+	host, flexera := config.Config.Account.AppHostAndIsFlexera()
+	if flexera {
+		return fmt.Sprintf("https://%s/orgs/%d/policy/projects/%d/applied-policies/%s",
+			host, ap.Project.OrgID, ap.Project.ID, ap.ID)
+	}
+	return fmt.Sprintf("https://%s/org/%d/projects/%d/applied-policies/%s",
+		host, ap.Project.OrgID, ap.Project.ID, ap.ID)
 }
 
 func incidentUILink(i *incident.Incident) string {
-	return fmt.Sprintf("https://governance.rightscale.com/org/%d/projects/%d/policy-incidents/%s",
-		i.Project.OrgID, i.Project.ID, i.ID)
+	host, flexera := config.Config.Account.AppHostAndIsFlexera()
+	if flexera {
+		return fmt.Sprintf("https://%s/orgs/%d/policy/projects/%d/incidents/%s",
+			host, i.Project.OrgID, i.Project.ID, i.ID)
+	}
+	return fmt.Sprintf("https://%s/org/%d/projects/%d/policy-incidents/%s",
+		host, i.Project.OrgID, i.Project.ID, i.ID)
 }

config/config.go

@@ -30,7 +30,7 @@ type (
 var (
 	Config     ConfigViper
 	boolRegexp = regexp.MustCompile(`^(?i:true)$`)
-	hostRegexp = regexp.MustCompile(`^governance-(\d+)\.(test.)?rightscale\.com$`)
+	hostRegexp = regexp.MustCompile(`^(?:governance-(\d+)\.(test.)?rightscale\.com|eu-central-1\.policy-eu\.flexeraeng\.com)$`)
 )
 
 func init() {
@@ -268,7 +268,9 @@ func (a *Account) AuthHost() string {
 	}
 	shardNum := matches[1]
 	testHost := matches[2]
-	if a.Flexera != nil && *a.Flexera {
+	if shardNum == "" {
+		return "login.flexera.eu"
+	} else if a.Flexera != nil && *a.Flexera {
 		if testHost != "" {
 			return "login.flexeratest.com"
 		}
@@ -284,3 +286,25 @@ func (a *Account) AuthHost() string {
 		return fmt.Sprintf("%s-%s.%srightscale.com", prefix, shardNum, testHost)
 	}
 }
+
+func (a *Account) AppHostAndIsFlexera() (string, bool) {
+	matches := hostRegexp.FindStringSubmatch(a.Host)
+	if len(matches) == 0 {
+		return "", false
+	}
+	shardNum := matches[1]
+	testHost := matches[2]
+	if shardNum == "" {
+		return "app.flexera.eu", true
+	} else if a.Flexera != nil && *a.Flexera {
+		if testHost != "" {
+			return "app.flexeratest.com", true
+		}
+		return "app.flexera.com", true
+	} else {
+		if testHost != "" {
+			return "governance.test.rightscale.com", false
+		}
+		return "governance.rightscale.com", false
+	}
+}