Merge pull request #790 from SoftLayer/pluginSupport

Plugin support

Author: allmightyspiff

.secrets.baseline

@@ -3,7 +3,7 @@
     "files": "(.*test.*)|(vendor)|(go.sum)|^.secrets.baseline$",
     "lines": null
   },
-  "generated_at": "2023-07-17T15:25:40Z",
+  "generated_at": "2023-08-29T21:40:56Z",
   "plugins_used": [
     {
       "name": "AWSKeyDetector"
@@ -65,6 +65,16 @@
     }
   ],
   "results": {
+    "bin/buildAndDeploy.py": [
+      {
+        "hashed_secret": "82e725817f214b04e55d8136779d09dde4195560",
+        "is_secret": false,
+        "is_verified": false,
+        "line_number": 307,
+        "type": "Hex High Entropy String",
+        "verified_result": null
+      }
+    ],
     "cliChecker/cliOutput.txt": [
       {
         "hashed_secret": "59b189070af751d4e93a749ccffb4ccfd2de7ab5",
@@ -310,15 +320,15 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "7d44c33cf9a82ab9bd5300d266784504e9772177",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4792,
+        "line_number": 4744,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -328,7 +338,7 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 5092,
+        "line_number": 5148,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -346,15 +356,15 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "8927bd748f26a7258a01e318a7e1e7585458a228",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4792,
+        "line_number": 4744,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -364,7 +374,7 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -374,7 +384,7 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -384,15 +394,15 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4747,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "d3ac7a4ef1a838b4134f2f6e7f3c0d249d74b674",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4792,
+        "line_number": 4748,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -402,15 +412,15 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       },
       {
         "hashed_secret": "d3ac7a4ef1a838b4134f2f6e7f3c0d249d74b674",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4792,
+        "line_number": 4744,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -420,7 +430,7 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -430,7 +440,7 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       }
@@ -440,7 +450,7 @@
         "hashed_secret": "bbccdf2efb33b52e6c9d0a14dd70b2d415fbea6e",
         "is_secret": false,
         "is_verified": false,
-        "line_number": 4791,
+        "line_number": 4743,
         "type": "Secret Keyword",
         "verified_result": null
       }

README.md

@@ -326,7 +326,24 @@ anything with `T("some string here")` uses the internationalization system. Defi
 The string passed into the `T()` function serves as the ID when looking these up. So the ID Will need to be present in all i18n files, it will also need a translation string. 
 
 [i18n4go](https://github.com/maximilien/i18n4go) is used to make sure all strings being transalted have translations. To test run this command.
+
+For i18n4go, we specifically use v0.2.4 for now, so we have a prebuilt binary in `./bin/i18n4go`. If that binary needs to be rebuilt, use the SoftLayer fork at https://github.com/softlayer/i18n4go (which is set to the version we need, along with some updates since that version had a bug with --help).
+
+This command will build the Mac (arm64) version. Replace GOOS and GOARCH with the OS/Architecture you need to build for.
+```
+~/go/src/github.ibm.com/softlayer/softlayer-cli/i18n4go (master)
+$> GOOS=darwin GOARCH=arm64 go build -o i18n4go_mac -ldflags "-s -w" i18n4go/i18n4go.go
+```
+
 [go-i18n](https://github.com/nicksnyder/go-i18n/) is what is actually doing the translations, but its using an old v1 version.
+There should be copies of the binary in `./bin` but if you need to rebuild this:
+Make sure you are on the v0.2.4 branch since that is the latest version that works as expected. We need to update this.
+```
+ ~/go/src/github.com/maximilien/i18n4go (v0.2.4_dev)
+$> GOOS=linux GOARCH=amd64   go build -o out/i18n4go ./i18n4go/i18n4go.go
+```
+
+
 [go-bindata](https://github.com/jteeuwen/go-bindata) takes the json files, and turns them into a go binary.
 
 ### Basic Patterns and Tips
@@ -470,4 +487,19 @@ It("return error", func() {
     Expect(err).To(HaveOccurred())
     Expect(err.Error()).To(ContainSubstring("Failed to show hardware."))
 })
-```
+```
+
+
+# Plugin Support / Release Process
+After v1.4.1 `sl` will be a normal plugin, so where are the instructions to build the plugin. 
+
+0. Create a new version and tag it in github like normal.
+1. Build the binaries. 
+```bash
+./bin/build-all
+for i in `ls --indicator-style=none out`; do echo "Uploading $i";  ibmcloud.exe cos upload --bucket softlayer-cli-binaries --file ./out/$i --key $i; done;
+```  
+2. Run the Jenkins job https://wcp-cloud-foundry-jenkins.swg-devops.com/job/Publish%20Plugin%20to%20YS1/
+
+## TODO
+Automate build with https://github.ibm.com/coligo/cli/tree/main/script

bin/build-all

@@ -9,9 +9,9 @@ build() {
     local os=$1
     local arch=$2
 
-    GOOS=$os GOARCH=$arch $ROOT_DIR/bin/build
+    GOOS=$os GOARCH=$arch go build -ldflags "-s -w" -o $ROOT_DIR/out/sl .
 
-    for f in ibmcloud; do
+    for f in sl; do
         nf="$f-$os-$arch"
         if [ "$os" == "windows" ]; then
             nf="$nf.exe"
@@ -21,17 +21,30 @@ build() {
     done
 }
 
+echo "Generating i18n resource file ..."
+if [[ "$OSTYPE" == "msys"* ]]; then
+    # For SO windows
+    ./bin/go-bindata.exe -pkg resources -o plugin/resources/i18n_resources.go plugin/i18n/resources
+else
+    ./bin/go-bindata -pkg resources -o plugin/resources/i18n_resources.go plugin/i18n/resources
+fi
+echo "Done."
+
+
+echo "Building Binaries ..."
 # disable CGO for Linux
 CGO_ENABLED=0 build linux amd64
 CGO_ENABLED=0 build linux 386
 CGO_ENABLED=0 build linux arm64
 
 build darwin amd64
+build darwin arm64
 
 build linux ppc64le
 build linux s390x
 
 build windows amd64
 build windows 386
 
-shasum $ROOT_DIR/out/ibmcloud-*
+echo "Generating binary hases ..."
+shasum $ROOT_DIR/out/sl-*