rbx 3.28.1.dev211__tar.gz → 3.28.2__tar.gz

{rbx-3.28.1.dev211/rbx.egg-info → rbx-3.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.28.1.dev211
+Version: 3.28.2
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License-Expression: AGPL-3.0-or-later
@@ -25,7 +25,6 @@ Requires-Dist: lxml<6,>=5.3.0
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
 Requires-Dist: boto3; extra == "all"
-Requires-Dist: fabric~=3.2.0; extra == "all"
 Requires-Dist: google-cloud-error-reporting<2,>=1.9.2; extra == "all"
 Requires-Dist: google-cloud-firestore<3,>=2.3; extra == "all"
 Requires-Dist: google-cloud-pubsub<3,>=2.9; extra == "all"
@@ -41,7 +40,6 @@ Requires-Dist: google-cloud-firestore<3,>=2.3; extra == "auth"
 Provides-Extra: buildtools
 Requires-Dist: bump-my-version; extra == "buildtools"
 Requires-Dist: check-manifest; extra == "buildtools"
-Requires-Dist: fabric~=3.2.0; extra == "buildtools"
 Requires-Dist: Jinja2==3.1.2; extra == "buildtools"
 Requires-Dist: twine; extra == "buildtools"
 Provides-Extra: notifications

{rbx-3.28.1.dev211 → rbx-3.28.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rbx"
-version = "3.28.1.dev211"
+version = "3.28.2"
 description = "A collection of common tools for Scoota services."
 authors = [
     { name = "The Scoota Engineering Team", email = "engineering@scoota.com" }
@@ -35,7 +35,6 @@ dependencies = [
 [project.optional-dependencies]
 all = [
     "boto3",
-    "fabric~=3.2.0",
     "google-cloud-error-reporting>=1.9.2,<2",
     "google-cloud-firestore>=2.3,<3",
     "google-cloud-pubsub>=2.9,<3",
@@ -53,7 +52,6 @@ auth = [
 buildtools = [
     "bump-my-version",
     "check-manifest",
-    "fabric~=3.2.0",
     "Jinja2==3.1.2",
     "twine",
 ]
@@ -78,7 +76,7 @@ homepage = "https://github.com/rockabox/rbx"
 repository = "https://github.com/rockabox/rbx.git"
 
 [tool.bumpversion]
-current_version = "3.28.1.dev211"
+current_version = "3.28.2"
 commit = true
 parse = """
 	(?P<major>\\d+)\\.

rbx-3.28.2/rbx/__init__.py

@@ -0,0 +1 @@
+__version__ = "3.28.2"

rbx-3.28.2/rbx/buildtools/tasks/ec2.py

@@ -0,0 +1,52 @@
+import click
+import subprocess
+
+
+@click.command()
+@click.argument("instance")
+@click.argument("service")
+@click.argument("environment")
+@click.option("--sandboxed/--no-sandboxed", default=True)
+@click.option("-v", "--version", default="latest")
+def deploy(instance, service, environment, sandboxed, version):
+    """Deploy to EC2.
+
+    Download a Docker image and start the container on a Remote EC2 instance.
+    """
+    command = f"/home/ec2-user/deploy.sh {service} {environment} --version {version}"
+    if not sandboxed:
+        command += " --no-sandboxed"
+
+    result = subprocess.run(
+        [
+            "aws",
+            "ssm",
+            "send-command",
+            "--document-name",
+            "AWS-RunShellScript",
+            "--parameters",
+            f'commands=["{command}"]',
+            "--targets",
+            f"Key=instanceids,Values={instance}",
+            "--query",
+            "Command.CommandId",
+            "--output",
+            "text",
+        ],
+        capture_output=True,
+    )
+
+    command_id = result.stdout.strip()
+
+    subprocess.run(
+        [
+            "aws",
+            "ssm",
+            "wait",
+            "command-executed",
+            "--command-id",
+            command_id,
+            "--instance-id",
+            instance,
+        ]
+    )

{rbx-3.28.1.dev211 → rbx-3.28.2}/rbx/buildtools/tasks/image.py

@@ -3,9 +3,8 @@ from os import getcwd, path
 
 import click
 
-from .. import REGISTRY
-
 BASEPATH = path.basename(getcwd())
+REGISTRY = "474071279654.dkr.ecr.eu-west-1.amazonaws.com"
 
 
 @click.command()

{rbx-3.28.1.dev211 → rbx-3.28.2/rbx.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rbx
-Version: 3.28.1.dev211
+Version: 3.28.2
 Summary: A collection of common tools for Scoota services.
 Author-email: The Scoota Engineering Team <engineering@scoota.com>
 License-Expression: AGPL-3.0-or-later
@@ -25,7 +25,6 @@ Requires-Dist: lxml<6,>=5.3.0
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
 Requires-Dist: boto3; extra == "all"
-Requires-Dist: fabric~=3.2.0; extra == "all"
 Requires-Dist: google-cloud-error-reporting<2,>=1.9.2; extra == "all"
 Requires-Dist: google-cloud-firestore<3,>=2.3; extra == "all"
 Requires-Dist: google-cloud-pubsub<3,>=2.9; extra == "all"
@@ -41,7 +40,6 @@ Requires-Dist: google-cloud-firestore<3,>=2.3; extra == "auth"
 Provides-Extra: buildtools
 Requires-Dist: bump-my-version; extra == "buildtools"
 Requires-Dist: check-manifest; extra == "buildtools"
-Requires-Dist: fabric~=3.2.0; extra == "buildtools"
 Requires-Dist: Jinja2==3.1.2; extra == "buildtools"
 Requires-Dist: twine; extra == "buildtools"
 Provides-Extra: notifications

{rbx-3.28.1.dev211 → rbx-3.28.2}/rbx.egg-info/requires.txt

@@ -7,7 +7,6 @@ requests>=2.31.0
 
 [all]
 boto3
-fabric~=3.2.0
 google-cloud-error-reporting<2,>=1.9.2
 google-cloud-firestore<3,>=2.3
 google-cloud-pubsub<3,>=2.9
@@ -25,7 +24,6 @@ google-cloud-firestore<3,>=2.3
 [buildtools]
 bump-my-version
 check-manifest
-fabric~=3.2.0
 Jinja2==3.1.2
 twine
 

rbx-3.28.1.dev211/rbx/__init__.py

@@ -1 +0,0 @@
-__version__ = "3.28.1.dev211"

rbx-3.28.1.dev211/rbx/buildtools/__init__.py

@@ -1,3 +0,0 @@
-REGISTRY = "474071279654.dkr.ecr.eu-west-1.amazonaws.com"
-REGION = "eu-west-1"
-CONFIGURATIONS = "s3://474071279654-eu-west-1-configurations"

rbx-3.28.1.dev211/rbx/buildtools/tasks/ec2.py

@@ -1,72 +0,0 @@
-import click
-from fabric import Connection
-
-from .. import CONFIGURATIONS, REGISTRY
-
-
-@click.command()
-@click.argument("host")
-@click.argument("user")
-@click.argument("key_filename")
-@click.argument("service")
-@click.argument("environment")
-@click.option("--sandboxed/--no-sandboxed", default=True)
-@click.option("-v", "--version", default="latest")
-def deploy(host, user, key_filename, service, environment, sandboxed, version):
-    """Deploy to EC2.
-
-    Download a Docker image and start the container on a Remote Server.
-    """
-    connection = Connection(
-        host=host, user=user, connect_kwargs={"key_filename": key_filename}
-    )
-
-    # Login to Scoota Docker Registry
-    connection.run(
-        "aws ecr get-login-password | docker login"
-        f" --username AWS --password-stdin {REGISTRY}",
-        echo=True,
-    )
-
-    # Get the latest configuration for the Server we are deploying to.
-    # Valid configurations are located at '/<Service>/<Env>/'
-    connection.run(
-        f"aws s3 sync {CONFIGURATIONS}/{service}/{environment} {service}"
-        " --exact-timestamps --delete",
-        echo=True,
-    )
-
-    # Pull the new version before restarting the services.
-    connection.run(
-        f"docker-compose -p {service}{environment} -f {service}/docker-compose.yml pull",
-        echo=True,
-        env={
-            "SANDBOXED": sandboxed,
-            "VERSION": version,
-        },
-    )
-
-    # Restart the Docker container forcing recreate so that new version is used.
-    # Using `force-recreate` alone doesn't seem to be enough to use the latest version. So we
-    # do `down` and then `up`.
-    connection.run(
-        f"docker-compose -p {service}{environment} -f {service}/docker-compose.yml down"
-        " --volumes --remove-orphans",
-        echo=True,
-        env={
-            "SANDBOXED": sandboxed,
-            "VERSION": version,
-        },
-        warn=True,
-    )
-    connection.run(
-        f"docker-compose -p {service}{environment} -f {service}/docker-compose.yml up -d",
-        echo=True,
-        env={
-            "SANDBOXED": sandboxed,
-            "VERSION": version,
-        },
-    )
-
-    # Remove all unused Docker Images
-    connection.run("docker system prune --all --force", echo=True)