Update all services

Author: tarekbadrsh

cli/cdevents/cli/artifact.py

@@ -54,14 +54,15 @@ def packaged(
     data: List[str] = None,
 ):
     print_function_args()
-    artifact_packaged_eventV1  = "cd.artifact.packaged.v1"
+    artifact_packaged_event_v1  = "cd.artifact.packaged.v1"
     extensions = {
         "artifactid": id,
         "artifactname": name,
         "artifactversion": version,
     }
+
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(artifact_packaged_eventV1, extensions, data)
+    cdevents_command.run(artifact_packaged_event_v1, extensions, data)
 
 
 @click.command(help=add_disclaimer_text("Artifact Published CloudEvent."))
@@ -73,11 +74,11 @@ def published(
     data: List[str] = None,
 ):
     print_function_args()
-    artifact_published_eventV1  = "cd.artifact.published.v1"
+    artifact_published_event_v1  = "cd.artifact.published.v1"
     extensions = {
         "artifactid": id,
         "artifactname": name,
         "artifactversion": version,
     }
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(artifact_published_eventV1, extensions, data)
+    cdevents_command.run(artifact_published_event_v1, extensions, data)

cli/cdevents/cli/branch.py

@@ -1,29 +1,17 @@
 """Module for cli branch commands."""
 from __future__ import annotations
 
-import logging
 import os
 from typing import List
 
 import click
-import requests
-from cloudevents.http import CloudEvent, to_structured
 
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
-
-_log = logging.getLogger(__name__)
+from cdevents.cli.cdevents_command import CDeventsCommand
 
 # pylint: disable=unused-argument
 def common_branch_options(function):
     """Decorator for common cli options for branch."""
-    function = click.option(
-        "--cde_sink",
-        "-c",
-        required=False,
-        type=str,
-        default=lambda: os.environ.get("CDE_SINK", "http://localhost:8080"),
-        help="CDE_SINK",
-    )(function)
     function = click.option(
         "--id",
         "-i",
@@ -60,51 +48,37 @@ def common_branch_options(function):
 @click.command(help=add_disclaimer_text("Branch Created CloudEvent."))
 @common_branch_options
 def created(
-    cde_sink: str,
     id: str,
     name: str = None,
     repoid: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.repository.branch.created.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "branchid": id,
-            "branchname": name,
-            "branchrepositoryid": repoid,
-        },
+    branch_created_event_v1  = "cd.repository.branch.created.v1"
+    extensions = {
+        "branchid": id,
+        "branchname": name,
+        "branchrepositoryid": repoid,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(branch_created_event_v1, extensions, data)
 
 @click.command(help=add_disclaimer_text("Branch Deleted CloudEvent."))
 @common_branch_options
 def deleted(
-    cde_sink: str,
     id: str,
     name: str = None,
     repoid: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.repository.branch.deleted.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "branchid": id,
-            "branchname": name,
-            "branchrepositoryid": repoid,
-        },
+    branch_deleted_event_v1 = "cd.repository.branch.deleted.v1"
+    extensions = {
+        "branchid": id,
+        "branchname": name,
+        "branchrepositoryid": repoid,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(branch_deleted_event_v1, extensions, data)

cli/cdevents/cli/build.py

@@ -1,30 +1,17 @@
 """Module for cli build commands."""
 from __future__ import annotations
 
-import logging
 import os
 from typing import List
 
 import click
-import requests
-from cloudevents.http import CloudEvent, to_structured
 
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
-
-_log = logging.getLogger(__name__)
-
+from cdevents.cli.cdevents_command import CDeventsCommand
 
 # pylint: disable=unused-argument
 def common_build_options(function):
     """Decorator for common cli options for build."""
-    function = click.option(
-        "--cde_sink",
-        "-c",
-        required=False,
-        type=str,
-        default=lambda: os.environ.get("CDE_SINK", "http://localhost:8080"),
-        help="CDE_SINK",
-    )(function)
     function = click.option(
         "--id",
         "-i",
@@ -62,79 +49,57 @@ def common_build_options(function):
 @click.command(help=add_disclaimer_text("Build Started CloudEvent."))
 @common_build_options
 def started(
-    cde_sink: str,
     id: str,
     name: str = None,
     artifact: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.build.started.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "buildid": id,
-            "buildname": name,
-            "buildartifactid": artifact,
-        },
+    build_started_event_v1 = "cd.build.started.v1"
+    extensions = {
+        "buildid": id,
+        "buildname": name,
+        "buildartifactid": artifact,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
-
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
 
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(build_started_event_v1, extensions, data)
 
 @click.command(help=add_disclaimer_text("Build Finished CloudEvent."))
 @common_build_options
 def finished(
-    cde_sink: str,
     id: str,
     name: str = None,
     artifact: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.build.finished.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "buildid": id,
-            "buildname": name,
-            "buildartifactid": artifact,
-        },
+    build_finished_event_v1 = "cd.build.finished.v1"
+    extensions = {
+        "buildid": id,
+        "buildname": name,
+        "buildartifactid": artifact,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(build_finished_event_v1, extensions, data)
 
 
 @click.command(help=add_disclaimer_text("PipelineRun Queued CloudEvent."))
 @common_build_options
 def queued(
-    cde_sink: str,
     id: str,
     name: str = None,
     artifact: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.build.queued.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "buildid": id,
-            "buildname": name,
-            "buildartifactid": artifact,
-        },
+    build_queued_event_v1 = "cd.build.queued.v1"
+    extensions = {
+        "buildid": id,
+        "buildname": name,
+        "buildartifactid": artifact,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(build_queued_event_v1, extensions, data)

cli/cdevents/cli/env.py

@@ -1,29 +1,17 @@
 """Module for cli environment commands."""
 from __future__ import annotations
 
-import logging
 import os
 from typing import List
 
 import click
-import requests
-from cloudevents.http import CloudEvent, to_structured
 
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
-
-_log = logging.getLogger(__name__)
+from cdevents.cli.cdevents_command import CDeventsCommand
 
 # pylint: disable=unused-argument
 def common_env_options(function):
     """Decorator for common cli options for environment."""
-    function = click.option(
-        "--cde_sink",
-        "-c",
-        required=False,
-        type=str,
-        default=lambda: os.environ.get("CDE_SINK", "http://localhost:8080"),
-        help="CDE_SINK",
-    )(function)
     function = click.option(
         "--id",
         "-i",
@@ -60,79 +48,58 @@ def common_env_options(function):
 @click.command(help=add_disclaimer_text("Environment Created CloudEvent."))
 @common_env_options
 def created(
-    cde_sink: str,
     id: str,
     name: str = None,
     repo: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.environment.created.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "envId": id,
-            "envname": name,
-            "envrepourl": repo,
-        },
+    environment_created_event_v1 = "cd.environment.created.v1"
+    extensions = {
+        "envId": id,
+        "envname": name,
+        "envrepourl": repo,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(environment_created_event_v1, extensions, data)
 
 
 @click.command(help=add_disclaimer_text("Environment Deleted CloudEvent."))
 @common_env_options
 def deleted(
-    cde_sink: str,
     id: str,
     name: str = None,
     repo: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.environment.deleted.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "envId": id,
-            "envname": name,
-            "envrepourl": repo,
-        },
+    environment_deleted_event_v1 = "cd.environment.deleted.v1"
+    extensions = {
+        "envId": id,
+        "envname": name,
+        "envrepourl": repo,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(environment_deleted_event_v1, extensions, data)
 
 
 @click.command(help=add_disclaimer_text("Environment Modified CloudEvent."))
 @common_env_options
 def modified(
-    cde_sink: str,
     id: str,
     name: str = None,
     repo: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    attributes = {
-        "type": "cd.environment.modified.v1",
-        "source": "cde-cli",
-        "extensions": {
-            "envId": id,
-            "envname": name,
-            "envrepourl": repo,
-        },
+    environment_modified_event_v1 = "cd.environment.modified.v1"
+    extensions = {
+        "envId": id,
+        "envname": name,
+        "envrepourl": repo,
     }
-    event = CloudEvent(attributes, dict(data))
-    headers, body = to_structured(event)
 
-    # send and print event
-    result = requests.post(cde_sink, headers=headers, data=body)
-    _log.debug(f"Response with state code {result.status_code}")
+    cdevents_command = CDeventsCommand()
+    cdevents_command.run(environment_modified_event_v1, extensions, data)