simplify the binary location

Author: b-b3rn4rd

.gitignore

@@ -2,4 +2,7 @@
 /coverage.*
 console
 /awsmocks
-dist
+dist
+awscli-console-plugin
+awscli_console_plugin.egg-info/
+build/

console.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"os/exec"
 	"strconv"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -17,6 +16,7 @@ import (
 
 	"github.com/alecthomas/kong"
 	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/skratchdot/open-golang/open"
 )
 
 type Context struct {
@@ -80,17 +80,12 @@ func (cli *Console) consoleURL(signinToken string, destinationURL string) string
 	return consoleURL.String()
 }
 
-// Credentials will only work with one of the latest versions of the AWS Go SDK (see go.mod)
-// 1.40.26 was found to work. Versions < 1.40.x would not read profiles that were kept in
-// ~/.aws/config but only looked at ~/.aws/credentials
 func (cli *Console) Credentials(profile string) (credentials.Value, string, error) {
 	var sess *session.Session
 
 	if profile != "" {
 		sess = session.Must(session.NewSessionWithOptions(session.Options{
 			Profile: profile,
-			// according to some otherwise unrelated Github Issue
-			SharedConfigState: session.SharedConfigEnable,
 		}))
 	} else {
 		sess = session.Must(session.NewSessionWithOptions(session.Options{
@@ -145,19 +140,9 @@ func (cli *Console) Run(ctx *Context) error {
 		return nil
 	}
 
-	// Have to run the browser "by hand", because of a discovered issues with AWS CLI v2 env vars
-	c := exec.Command("xdg-open", consoleURL)
-	// This is set somewhere in the framework to only the AWS CLI V2 dist path
-	// to the exclusion of everything else.
-	os.Unsetenv("LD_LIBRARY_PATH")
-	c.Env = os.Environ()
-	out, err := c.Output()
+	err = open.Run(consoleURL)
 	if err != nil {
-		if string(out) == "" {
-			e := err.(*exec.ExitError)
-			out = e.Stderr
-		}
-		return fmt.Errorf("error while opening browser, %s", out)
+		return fmt.Errorf("error while opening browser, %s", err)
 	}
 
 	return nil

console.py

@@ -55,18 +55,11 @@ def _call(self, options, parsed_globals):
         """Run the command."""
         cmd = []
 
-        # miserable hack because there are issue with AWS CLI V2 which causes this plugin to not find site.py
-        if found_site:
-            bin = os.path.join(site.USER_BASE, 'bin', 'awscli-console-plugin')
-            if not os.path.isfile(bin):
-                bin = os.path.join(sys.prefix, 'bin', 'awscli-console-plugin')
-        else:
-            bin = os.path.join(sys.prefix, 'bin', 'awscli-console-plugin')
-            if not os.path.isfile(bin):
-                # in addition when using pyenv, the Go executable will be installed somewhere among the shims
-                # instead of a "normal" location
-                if os.environ['PYENV_ROOT']:
-                    bin = os.path.join(os.environ['PYENV_ROOT'], 'shims', 'awscli-console-plugin')
+        side_packages = os.path.dirname(os.path.realpath(__file__))
+        try:
+            bin = os.path.join(side_packages, 'awscli-console-plugin', 'awscli-console-plugin')
+        except Exception as e:
+            print('executable is not found at {}'.format(bin))
 
         cmd.append(bin)
 

setup.py

@@ -1,13 +1,11 @@
 from setuptools import setup
+import sysconfig
 
 setup(
     name='awscli-console-plugin',
     version='0.1',
     py_modules=['console'],
-    data_files=[('bin', ['./awscli-console-plugin'])],
-    install_requires=[
-        'awscli',
-    ],
+    data_files=[('/awscli-console-plugin', ['./awscli-console-plugin'])],
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",
@@ -17,5 +15,5 @@
     author="Bernard Baltrusaitis",
     author_email="bernard@runawaylover.info",
     description="AWSCLI plugin to login to AWS Console using your IAM credentials",
-    python_requires='>=3.6',
+    python_requires='>=3.6'
 )