Bug fixes

Bug fixes and refactoring

Author: michaelraney

Dockerfile

@@ -1,6 +1,6 @@
 #Amazon Keyspaces toolkit
 
-ARG CLI_VERSION=2.1.27
+ARG CLI_VERSION=latest
 FROM amazon/aws-cli:$CLI_VERSION
 
 ENV AWS_KEYSPACES_WORKING_DIR=/root
@@ -9,70 +9,24 @@ ENV CQLSHRC_HOME=$AWS_KEYSPACES_WORKING_DIR/.cassandra
 
 WORKDIR $AWS_KEYSPACES_WORKING_DIR
 
-#Install python3 and set as python3 simlink 
-
-RUN yum install gcc openssl-devel bzip2-devel libffi-devel gzip make tar -y
-RUN curl https://www.python.org/ftp/python/3.7.9/Python-3.7.9.tgz --output Python-3.7.9.tgz
-RUN tar xzf Python-3.7.9.tgz
-WORKDIR $AWS_KEYSPACES_WORKING_DIR/Python-3.7.9
-RUN ./configure --enable-optimizations
-RUN make altinstall
-RUN export PATH=${PATH}:/usr/local/lib/
-RUN ln -s /usr/local/bin/python3.7 /usr/bin/python3
-WORKDIR $AWS_KEYSPACES_WORKING_DIR
-RUN rm -f Python-3.7.9.tgz
+RUN mkdir $AWS_KEYSPACES_WORKING_DIR/bin
 
 #Install jq
-RUN yum install -y jq && yum clean all
-
-#set as python3 as default interpreter
-RUN unlink /usr/bin/python
-RUN ln -s /usr/bin/python3 /usr/bin/python
-
-#setup directory structure
-RUN mkdir $CASSANDRA_HOME && \
-    mkdir $CASSANDRA_HOME/bin  && \
-    mkdir $CASSANDRA_HOME/lib  && \
-    mkdir $CASSANDRA_HOME/pylib  && \
-    mkdir $CASSANDRA_HOME/pylib/cqlshlib  && \
-    mkdir $AWS_KEYSPACES_WORKING_DIR/bin && \
-    mkdir $AWS_KEYSPACES_WORKING_DIR/distro && \
-    mkdir $CQLSHRC_HOME
-
-#CQLSH SETUP
+RUN yum install -y jq && yum install python3-pip -y && yum clean all
 
-COPY cqlsh-expansion/LICENSE.txt $CASSANDRA_HOME
-COPY cqlsh-expansion/bin/cqlsh cqlsh-expansion/bin/cqlsh.py $CASSANDRA_HOME/bin/
-COPY cqlsh-expansion/pylib/ $CASSANDRA_HOME/pylib/
+RUN pip3 install importlib-metadata
+RUN pip3 install boto3
+RUN pip3 install six
+RUN pip3 install -i https://test.pypi.org/simple/ cqlsh-expansion-mjpr==0.9.16
 
-COPY cqlsh-lib/cassandra-driver*.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/futures-*.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/boto3-1.16.52-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/botocore-1.19.54-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/cassandra_sigv4-4.0.2-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/six-1.15.0-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/python_dateutil-2.8.1-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/urllib3-1.26.2-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-COPY cqlsh-lib/jmespath-0.10.0-py2.py3-none-any.zip $CASSANDRA_HOME/lib/
-
-#ThirdParty License directory
-COPY THIRD-PARTY-LICENSES.txt $AWS_KEYSPACES_WORKING_DIR/distro/
+RUN cqlsh-expansion.init
 
 #toolkit helpers
 COPY bin/aws-cqlsh-expo-backoff.sh $AWS_KEYSPACES_WORKING_DIR/bin/aws-cqlsh-expo-backoff.sh
 COPY bin/aws-sm-cqlsh-expo-backoff.sh $AWS_KEYSPACES_WORKING_DIR/bin/aws-sm-cqlsh-expo-backoff.sh
 COPY bin/aws-cqlsh-expansion-expo-backoff.sh $AWS_KEYSPACES_WORKING_DIR/bin/aws-cqlsh-expansion-expo-backoff.sh
 COPY bin/aws-sm-cqlsh.sh $AWS_KEYSPACES_WORKING_DIR/bin/aws-sm-cqlsh.sh
 
-COPY cqlsh-expansion/bin/cqlsh-expansion $CASSANDRA_HOME/bin/cqlsh-expansion
-COPY cqlsh-expansion/bin/cqlsh-expansion.py $CASSANDRA_HOME/bin/cqlsh-expansion.py
-
-
-#Setup pem file
-COPY cqlsh-expansion/config/sf-class2-root.crt $CQLSHRC_HOME/sf-class2-root.crt
-COPY cqlsh-expansion/config/cqlshrc_template $CQLSHRC_HOME/cqlshrc
-
-
-ENV PATH="${PATH}:$AWS_KEYSPACES_WORKING_DIR/bin:$CASSANDRA_HOME/bin"
+ENV PATH="${PATH}:$AWS_KEYSPACES_WORKING_DIR/bin"
 
-ENTRYPOINT ["cqlsh-expansion"]
+ENTRYPOINT ["cqlsh-expansion"]

cqlsh-expansion/README.md

@@ -62,12 +62,12 @@ region_name = us-east-1
 you can also set region as Environment variable
 
 ```
- export AWS_DEFAULT_REGION = us-east-1
+ export AWS_DEFAULT_REGION=us-east-1 
 ```
 
 To connect to Amazon Keyspaces with cqlsh-expansion using Sigv4 authenticator.  
 ```
-cqlsh-expansion cassandra.us-east-1.amazonaws.com 
+cqlsh-expansion cassandra.us-east-1.amazonaws.com 9142 --ssl 
 ```
 
 #### Connect with service-specific credentials

cqlsh-expansion/bin/cqlsh

@@ -0,0 +1,10 @@
+import os
+import sys
+from cqlsh_expansion.cqlsh import main as cqlsh_main
+from cqlsh_expansion.cqlsh import read_options
+
+def main():
+    cqlsh_main(*read_options(sys.argv[1:], os.environ))
+
+if __name__ == '__main__':
+    sys.exit(main()) 

cqlsh-expansion/bin/cqlsh-expansion

@@ -0,0 +1,10 @@
+import os
+import sys
+from cqlsh_expansion.cqlsh_expansion import main as cqlsh_main
+from cqlsh_expansion.cqlsh_expansion import read_options
+
+def main():
+    cqlsh_main(*read_options(sys.argv[1:], os.environ))
+
+if __name__ == '__main__':
+    sys.exit(main())