Merge pull request #8 from rightscale/PHX-1514_wrong_hostname_message

PHX-1514 Correct hostname error message

.gitignore

@@ -2,7 +2,7 @@ vendor/
 version.go
 version.yml
 build
-/right_pt
+/fpt
 *.coverprofile
 *.bak
 *.old

cmd/fpt/ChangeLog.md

@@ -1,3 +1,8 @@
+v1.0.3 / 2019-03-14
+-------------------
+* Fix errors for bad hostname in config.
+* Fix bad_request error for template in subdirectories.
+
 v1.0.2 / 2019-02-15
 -------------------
 * Add way to past list param to script command

cmd/fpt/check.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 
 	"github.com/rightscale/policy_sdk/client/policy"
 	policytemplate "github.com/rightscale/policy_sdk/sdk/policy_template"
@@ -35,7 +36,7 @@ func doCheck(ctx context.Context, cli policy.Client, file string) error {
 		return err
 	}
 
-	err = cli.CompilePolicyTemplate(ctx, file, string(srcBytes))
+	err = cli.CompilePolicyTemplate(ctx, filepath.Base(file), string(srcBytes))
 
 	if err != nil {
 		printCompileError(err)

cmd/fpt/main.go

@@ -96,10 +96,15 @@ func main() {
 	err := config.ReadConfig(*configFile, *account)
 	var client policy.Client
 	if !strings.HasPrefix(command, "config") && !strings.HasPrefix(command, "update") {
-		acct := config.Config.Account
 		// Makes sure the config file structure is valid
 		if err != nil {
-			fatalError("%s: Error reading config file: %s\n", filepath.Base(os.Args[0]), err.Error())
+			fatalError("%s: error reading config file: %s\n", *configFile, err.Error())
+		}
+
+		acct := config.Config.Account
+		err := acct.Validate()
+		if err != nil {
+			fatalError("%s: invalid config: %s\n", *configFile, err.Error())
 		}
 
 		ts, err := auth.NewOAuthAuthenticator(acct.AuthHost(), acct.RefreshToken)

cmd/fpt/upload.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"path/filepath"
 	"strings"
 
 	"github.com/rightscale/policy_sdk/client/policy"
@@ -35,11 +36,11 @@ func doUpload(ctx context.Context, cli policy.Client, file string) (*policytempl
 		return nil, err
 	}
 
-	pt, err := cli.UploadPolicyTemplate(ctx, file, string(srcBytes))
+	pt, err := cli.UploadPolicyTemplate(ctx, filepath.Base(file), string(srcBytes))
 	verb := "Created"
 	if err != nil && errorName(err) == "conflict" {
 		errTyped := err.(*policytemplate.ConflictError)
-		pt, err = cli.UpdatePolicyTemplate(ctx, idFromHref(errTyped.Location), file, string(srcBytes))
+		pt, err = cli.UpdatePolicyTemplate(ctx, idFromHref(errTyped.Location), filepath.Base(file), string(srcBytes))
 		verb = "Updated"
 	}
 	if err != nil {