Merge branch 'main' of github.com:SlideRuleEarth/sliderule

Author: elidwa

clients/python/utils/srcli.py

@@ -27,6 +27,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import json
 import argparse
 import sliderule
 
@@ -40,6 +41,7 @@
 parser.add_argument('--version',            type=str,               default="unstable")
 parser.add_argument('--branch',             type=str,               default="main")
 parser.add_argument('--report',             type=str,               default="clusters")
+parser.add_argument('-j', '--asjson',       action='store_true',    default=False)
 parser.add_argument('-c', '--commands',     nargs='+', type=str,    default=[])
 args,_ = parser.parse_known_args()
 
@@ -48,20 +50,21 @@
 
 # Command Runner
 CommandRunner = {
-
     # Provisioner
     "deploy": lambda: session.provisioner.deploy(is_public=args.is_public, node_capacity=args.node_capacity, ttl=args.ttl, version=args.version),
     "destroy": session.provisioner.destroy,
     "status": session.provisioner.status,
     "events": session.provisioner.events,
     "report": lambda: session.provisioner.report(kind=args.report),
     "test": lambda: session.provision("test", {"branch":args.branch}),
-
     # Cluster
     "version": lambda: session.source("version")
-
 }
 
 # Execute Commands
 for command in args.commands:
-    print(CommandRunner[command]())
+    result = CommandRunner[command]()
+    if args.asjson:
+        print(json.dumps(result, indent=2))
+    else:
+        print(result)

targets/slideruleearth/Makefile

@@ -379,7 +379,7 @@ testrunner-delete: ## deletes the test runner and any lingering event bridge rul
 	- aws events delete-rule --name testrunner-auto-delete
 
 testrunner-report: ## invokes the provisioner *report* lambda function and displays the response
-	python $(PYTHON_CLIENT_DIR)/utils/srcli.py --domain $(DOMAIN) --cluster $(CLUSTER) --commands report --report tests
+	python $(PYTHON_CLIENT_DIR)/utils/srcli.py --domain $(DOMAIN) --cluster $(CLUSTER) --commands report --report tests --asjson
 
 testrunner-run: ## invokes the provisioner *report* lambda function and displays the response
 	python $(PYTHON_CLIENT_DIR)/utils/srcli.py --domain $(DOMAIN) --cluster $(CLUSTER) --branch main --commands test
@@ -792,6 +792,19 @@ lambdatest:
 # Help Targets
 ########################
 
+init-dev-env: ## one-time setup of development environment for running locally
+	mkdir -p /data/ATL13
+	aws s3 cp s3://$(PROJECT_BUCKET)/$(PROJECT_FOLDER)/atl13.json /data/ATL13/atl13.json
+	aws s3 cp s3://$(PROJECT_BUCKET)/$(PROJECT_FOLDER)/atl13.db /data/ATL13/atl13.db
+	mkdir -p /data/ATL24
+	aws s3 cp s3://$(PROJECT_BUCKET)/$(PROJECT_FOLDER)/atl24r2.db /data/ATL24/atl24r2.db
+	mkdir -p /data/3DEP
+	aws s3 cp s3://$(PROJECT_BUCKET)/$(PROJECT_FOLDER)/3dep.db /data/3DEP/3dep.db
+	mkdir -p /etc/haproxy/pem
+	curl $(JWT_ISSUER)/auth/github/pem > /etc/haproxy/pem/pubkey.pem
+	mkdir -p /etc/ssl/private
+	aws s3 cp s3://$(PROJECT_BUCKET)/$(PROJECT_FOLDER)/$(DOMAIN).pem /etc/ssl/private/$(DOMAIN).pem
+
 environment: ## echo the environment variables
 	@echo INSTALLDIR: $(INSTALLDIR)
 	@echo PROJECT_BUCKET: $(PROJECT_BUCKET)

targets/slideruleearth/docker/sliderule/Dockerfile.buildenv

@@ -148,8 +148,8 @@ RUN git clone https://github.com/OSGeo/libgeotiff.git && \
     VERSION=`curl -s https://api.github.com/repos/OSGeo/libgeotiff/releases/latest | jq '.tag_name' | tr -d "\""` && \
     git checkout $VERSION && \
     echo libgeotiff: $(git --git-dir /libgeotiff/.git --work-tree /libgeotiff describe --abbrev --dirty --always --tags --long) >> /libdep.lock && \
-    mkdir -p /build/geotiff && \
-    cd /build/geotiff && \
+    mkdir -p /build/libgeotiff && \
+    cd /build/libgeotiff && \
     cmake /libgeotiff/libgeotiff -DCMAKE_BUILD_TYPE=Release && \
     make -j8 && \
     make install && \

targets/slideruleearth/docker/sliderule/libdep-aarch64.lock

@@ -3,7 +3,7 @@ arrow: apache-arrow-19.0.1-0-g07b05dad1a
 PROJ: 9.7.1-0-ge37c8172
 geos: 3.14.1-0-gc389f532d
 hdf5: hdf5-1.14.6-0-g7bf3404409
-aws-sdk-cpp: 1.11.733-0-gfd1cd8e2027
+aws-sdk-cpp: 1.11.739-0-ga104f27596b
 gdal: v3.12.1-0-g21882def44
 libgeotiff: 1.7.4-0-g96024f6
 PDAL: 2.9.3-0-g53d298a9d