- Experiment with docker user again.

Author: general-kroll-4-life

.vscode/launch.json

@@ -154,7 +154,8 @@
         "set global \"$.auth.google.sub\"='[email protected]';",
         "select JSON_EXTRACT(saml.samlIdentity, '$.username') as saml_username from github.scim.saml_ids saml where saml.org = 'dummyorg';",
         "select kind, name, maximumCardsPerInstance from google.compute.acceleratorTypes where project = 'defective-response-content-project' and zone = 'australia-southeast1-a' order by name desc;",
-        "registry pull google;"
+        "registry pull google;",
+        "create materialized view nv as select BackupId, BackupState  from aws.cloudhsm.backups where region = 'ap-southeast-2' order by BackupId;"
       ],
       "default": "show providers;"
     },

cicd/requirements.txt

@@ -5,5 +5,3 @@ PyYaml>=6.0.1
 requests==2.32.3
 robotframework==6.1.1
 sqlalchemy==1.4.44
-
-mistune==3.0.2

docker-compose-persist-postgres.yml

@@ -3,8 +3,8 @@ version: "3.9"
 services:
   stackqlsrv:
     image: "${STACKQL_IMAGE_NAME:-stackql/stackql}"
+    user: "${UID}:${GID}"
     build:
-      user: "${UID}:${GID}"
       context: .
       cache_from: 
         - "${STACKQL_IMAGE_NAME:-stackql/stackql}"

docker-compose.yml

@@ -2,7 +2,6 @@ version: "3.9"
 
 services:
   stackqlsrv:
-    user: "${UID}:${GID}"
     image: "${STACKQL_IMAGE_NAME:-stackql/stackql}"
     build:
       context: .
@@ -14,6 +13,8 @@ services:
         - BUILDMAJORVERSION=${BUILDMAJORVERSION:-1}
         - BUILDMINORVERSION=${BUILDMINORVERSION:-1}
         - BUILDPATCHVERSION=${BUILDPATCHVERSION:-1}
+        - UID=${UID}
+        - GID=${GID}
     command: 
       - bash
       - -c

test/python/flask/aws/app.py

@@ -4,6 +4,7 @@
 import re
 import json
 import base64
+import datetime
 
 app = Flask(__name__)
 app.template_folder = os.path.join(os.path.dirname(__file__), "templates")
@@ -226,7 +227,8 @@ def generic_handler(request: Request):
         logger.error(f"Missing template for route: {request}")
         return jsonify({'error': f'Missing template for route: {request}'}), 500
     logger.info(f"routing to template: {route_cfg['template']}")
-    response = make_response(render_template(route_cfg["template"], request=request))
+    twelve_days_ago = (datetime.datetime.now() - datetime.timedelta(days=12)).strftime("%Y-%m-%d")
+    response = make_response(render_template(route_cfg["template"], request=request, twelve_days_ago=twelve_days_ago))
     response.headers.update(route_cfg.get("response_headers", {}))
     response.status_code = route_cfg.get("status", 200)
     return response

test/python/flask/aws/templates/list_users_01.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ListUsersResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/"> <ListUsersResult>    <Users>       <member>          <UserId>AID2MAB8DPLSRHEXAMPLE</UserId>          <Path>/division_abc/subdivision_xyz/engineering/</Path>          <UserName>Andrew</UserName>          <Arn>arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/engineering/Andrew</Arn>          <CreateDate>2012-09-05T19:38:48Z</CreateDate>          <PasswordLastUsed>2014-09-08T21:47:36Z</PasswordLastUsed>       </member>       <member>          <UserId>AIDIODR4TAW7CSEXAMPLE</UserId>          <Path>/division_abc/subdivision_xyz/engineering/</Path>          <UserName>Jackie</UserName>          <Arn>arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/engineering/Jackie</Arn>          <CreateDate>2014-04-09T15:43:45Z</CreateDate>          <PasswordLastUsed>2024-12-15T03:02:52Z</PasswordLastUsed>       </member>    </Users>    <IsTruncated>false</IsTruncated> </ListUsersResult> <ResponseMetadata>    <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId> </ResponseMetadata> </ListUsersResponse>
+<ListUsersResponse xmlns="https://iam.amazonaws.com/doc/2010-05-08/"> <ListUsersResult>    <Users>       <member>          <UserId>AID2MAB8DPLSRHEXAMPLE</UserId>          <Path>/division_abc/subdivision_xyz/engineering/</Path>          <UserName>Andrew</UserName>          <Arn>arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/engineering/Andrew</Arn>          <CreateDate>2012-09-05T19:38:48Z</CreateDate>          <PasswordLastUsed>2014-09-08T21:47:36Z</PasswordLastUsed>       </member>       <member>          <UserId>AIDIODR4TAW7CSEXAMPLE</UserId>          <Path>/division_abc/subdivision_xyz/engineering/</Path>          <UserName>Jackie</UserName>          <Arn>arn:aws:iam::123456789012:user/division_abc/subdivision_xyz/engineering/Jackie</Arn>          <CreateDate>2014-04-09T15:43:45Z</CreateDate>          <PasswordLastUsed>{{ twelve_days_ago }}T03:02:52Z</PasswordLastUsed>       </member>    </Users>    <IsTruncated>false</IsTruncated> </ListUsersResult> <ResponseMetadata>    <RequestId>7a62c49f-347e-4fc4-9331-6e8eEXAMPLE</RequestId> </ResponseMetadata> </ListUsersResponse>

test/robot/functional/stackql_mocked_from_cmd_line.robot

@@ -2148,7 +2148,7 @@ Recently Active Logic Multi Backend
     ...    UserName,
     ...    CASE WHEN ( 
     ...      TO_TIMESTAMP(PasswordLastUsed, 'YYYY-MM-DDTHH:MI:SSZ') 
-    ...      > (now() - interval '7 days' ) )
+    ...      > (now() - interval '20 days' ) )
     ...     then 'true' else 'false' end as active 
     ...    from aws.iam.users 
     ...    WHERE region = 'us-east-1' and PasswordLastUsed is not null