Add core pakage

Author: tarekbadrsh

cdevents/__init__.py

@@ -6,11 +6,12 @@
 import click
 import yaml
 
+from cdevents.cli.constants import LOGGING_CONFIGURATION_FILE
+
 from cdevents.cli.artifact import packaged, published
 from cdevents.cli.branch import created as branch_created
 from cdevents.cli.branch import deleted as branch_deleted
 from cdevents.cli.build import finished, queued, started
-from cdevents.cli.constants import LOGGING_CONFIGURATION_FILE
 from cdevents.cli.env import created as env_created
 from cdevents.cli.env import deleted as env_deleted
 from cdevents.cli.env import modified as env_modified

cli/cdevents/cli/__main__.py

@@ -9,6 +9,9 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
+from cdevents.core.events import Events
+from cdevents.core import event_type
+
 # pylint: disable=unused-argument
 def common_artifact_options(function):
     """Decorator for common cli options for artifact."""
@@ -54,15 +57,10 @@ def packaged(
     data: List[str] = None,
 ):
     print_function_args()
-    artifact_packaged_event_v1  = "cd.artifact.packaged.v1"
-    extensions = {
-        "artifactid": id,
-        "artifactname": name,
-        "artifactversion": version,
-    }
-
+    e = Events()
+    new_event = e.create_artifact_event(event_type.ArtifactPackagedEventV1, id, name, version, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(artifact_packaged_event_v1, extensions, data)
+    cdevents_command.run(new_event)
 
 
 @click.command(help=add_disclaimer_text("Artifact Published CloudEvent."))
@@ -74,11 +72,8 @@ def published(
     data: List[str] = None,
 ):
     print_function_args()
-    artifact_published_event_v1  = "cd.artifact.published.v1"
-    extensions = {
-        "artifactid": id,
-        "artifactname": name,
-        "artifactversion": version,
-    }
+
+    e = Events()
+    new_event = e.create_artifact_event(event_type.ArtifactPublishedEventV1, id, name, version, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(artifact_published_event_v1, extensions, data)
+    cdevents_command.run(new_event)

cli/cdevents/cli/artifact.py

@@ -9,6 +9,9 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
+from cdevents.core.events import Events
+from cdevents.core import event_type
+
 # pylint: disable=unused-argument
 def common_branch_options(function):
     """Decorator for common cli options for branch."""
@@ -53,16 +56,12 @@ def created(
     repoid: str = None,
     data: List[str] = None,
 ):
-    print_function_args()
-    branch_created_event_v1  = "cd.repository.branch.created.v1"
-    extensions = {
-        "branchid": id,
-        "branchname": name,
-        "branchrepositoryid": repoid,
-    }
-
+    print_function_args() 
+    e = Events()
+    new_event = e.create_branch_event(event_type.BranchCreatedEventV1, id, name, repoid, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(branch_created_event_v1, extensions, data)
+    cdevents_command.run(new_event)
+
 
 @click.command(help=add_disclaimer_text("Branch Deleted CloudEvent."))
 @common_branch_options
@@ -72,13 +71,8 @@ def deleted(
     repoid: str = None,
     data: List[str] = None,
 ):
-    print_function_args()
-    branch_deleted_event_v1 = "cd.repository.branch.deleted.v1"
-    extensions = {
-        "branchid": id,
-        "branchname": name,
-        "branchrepositoryid": repoid,
-    }
-
+    print_function_args() 
+    e = Events()
+    new_event = e.create_branch_event(event_type.BranchDeletedEventV1, id, name, repoid, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(branch_deleted_event_v1, extensions, data)
+    cdevents_command.run(new_event)

cli/cdevents/cli/branch.py

@@ -9,6 +9,9 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
+from cdevents.core.events import Events
+from cdevents.core import event_type
+
 # pylint: disable=unused-argument
 def common_build_options(function):
     """Decorator for common cli options for build."""
@@ -55,15 +58,10 @@ def started(
     data: List[str] = None,
 ):
     print_function_args()
-    build_started_event_v1 = "cd.build.started.v1"
-    extensions = {
-        "buildid": id,
-        "buildname": name,
-        "buildartifactid": artifact,
-    }
-
+    e = Events()
+    new_event = e.create_build_event(event_type.BuildStartedEventV1, id, name, artifact, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(build_started_event_v1, extensions, data)
+    cdevents_command.run(new_event)
 
 @click.command(help=add_disclaimer_text("Build Finished CloudEvent."))
 @common_build_options
@@ -74,16 +72,10 @@ def finished(
     data: List[str] = None,
 ):
     print_function_args()
-    build_finished_event_v1 = "cd.build.finished.v1"
-    extensions = {
-        "buildid": id,
-        "buildname": name,
-        "buildartifactid": artifact,
-    }
-
+    e = Events()
+    new_event = e.create_build_event(event_type.BuildFinishedEventV1, id, name, artifact, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(build_finished_event_v1, extensions, data)
-
+    cdevents_command.run(new_event)
 
 @click.command(help=add_disclaimer_text("PipelineRun Queued CloudEvent."))
 @common_build_options
@@ -94,12 +86,7 @@ def queued(
     data: List[str] = None,
 ):
     print_function_args()
-    build_queued_event_v1 = "cd.build.queued.v1"
-    extensions = {
-        "buildid": id,
-        "buildname": name,
-        "buildartifactid": artifact,
-    }
-
+    e = Events()
+    new_event = e.create_build_event(event_type.BuildQueuedEventV1, id, name, artifact, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(build_queued_event_v1, extensions, data)
+    cdevents_command.run(new_event)

cli/cdevents/cli/build.py

@@ -3,10 +3,14 @@
 from abc import ABC
 import requests
 
+from cloudevents.http import CloudEvent
+
+from cdevents.core.event_sender import EventSender
+
 from cdevents.cli.configuration_handler import ConfigurationHandler
-from cloudevents.http import CloudEvent, to_structured
 from cdevents.cli.configuration_handler import new_default_configuration_handler
 
+
 class CDeventsCommand(ABC):
     """Abstract base class for all Hostlog commands."""
 
@@ -21,21 +25,24 @@ def __init__(self, config_handler: ConfigurationHandler = None):
         if config_handler is None:
             self._config_handler = new_default_configuration_handler()
 
-    def run(self, type, extensions, data):
+    def run(self, event: CloudEvent):
         """run command.
         """
-        attributes = {
-            "type": type,
-            "source": self.config_handler.source.name,
-            "extensions": extensions,
-        }
-        event = CloudEvent(attributes, dict(data))
-        headers, body = to_structured(event)
-        cde_link = self.config_handler.client.host
-
-        # send and print event
-        result = requests.post(cde_link, headers=headers, data=body)
-        self._log.info(f"Response with state code {result.status_code}")
+        # attributes = {
+        #     "type": type,
+        #     "source": self.config_handler.source.name,
+        #     "extensions": extensions,
+        # }
+        # event = CloudEvent(attributes, dict(data))
+        # headers, body = to_structured(event)
+        # cde_link = self.config_handler.client.host
+
+        # # send and print event
+        # result = requests.post(cde_link, headers=headers, data=body)
+        # self._log.info(f"Response with state code {result.status_code}")
+
+        e = EventSender(cde_link=self.config_handler.client.host)
+        e.send(event)
 
 
     @property

cli/cdevents/cli/cdevents_command.py

@@ -9,6 +9,9 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
+from cdevents.core.events import Events
+from cdevents.core import event_type
+
 # pylint: disable=unused-argument
 def common_env_options(function):
     """Decorator for common cli options for environment."""
@@ -54,15 +57,10 @@ def created(
     data: List[str] = None,
 ):
     print_function_args()
-    environment_created_event_v1 = "cd.environment.created.v1"
-    extensions = {
-        "envId": id,
-        "envname": name,
-        "envrepourl": repo,
-    }
-
+    e = Events()
+    new_event = e.create_environment_event(event_type.EnvironmentCreatedEventV1, id, name, repo, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(environment_created_event_v1, extensions, data)
+    cdevents_command.run(new_event)
 
 
 @click.command(help=add_disclaimer_text("Environment Deleted CloudEvent."))
@@ -74,16 +72,10 @@ def deleted(
     data: List[str] = None,
 ):
     print_function_args()
-    environment_deleted_event_v1 = "cd.environment.deleted.v1"
-    extensions = {
-        "envId": id,
-        "envname": name,
-        "envrepourl": repo,
-    }
-
+    e = Events()
+    new_event = e.create_environment_event(event_type.EnvironmentDeletedEventV1, id, name, repo, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(environment_deleted_event_v1, extensions, data)
-
+    cdevents_command.run(new_event)
 
 @click.command(help=add_disclaimer_text("Environment Modified CloudEvent."))
 @common_env_options
@@ -94,12 +86,7 @@ def modified(
     data: List[str] = None,
 ):
     print_function_args()
-    environment_modified_event_v1 = "cd.environment.modified.v1"
-    extensions = {
-        "envId": id,
-        "envname": name,
-        "envrepourl": repo,
-    }
-
+    e = Events()
+    new_event = e.create_environment_event(event_type.EnvironmentModifiedEventV1, id, name, repo, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(environment_modified_event_v1, extensions, data)
+    cdevents_command.run(new_event)

cli/cdevents/cli/env.py

@@ -9,6 +9,9 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
+from cdevents.core.events import Events
+from cdevents.core import event_type
+
 # pylint: disable=unused-argument
 def common_pipelinerun_options(function):
     """Decorator for common cli options for pipelinerun."""
@@ -70,17 +73,10 @@ def started(
     data: List[str] = None,
 ):
     print_function_args()
-    pipeline_run_started_event_v1  = "cd.pipelinerun.started.v1"
-    extensions = {
-        "pipelinerunid": id,
-        "pipelinerunname": name,
-        "pipelinerunstatus": status,
-        "pipelinerunurl": url,
-        "pipelinerunerrors": errors,
-    }
-
+    e = Events()
+    new_event = e.create_pipelinerun_event(event_type.PipelineRunStartedEventV1, id, name, status, url, errors, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(pipeline_run_started_event_v1, extensions, data)
+    cdevents_command.run(new_event)
 
 
 @click.command(help=add_disclaimer_text("PipelineRun Finished CloudEvent."))
@@ -94,17 +90,10 @@ def finished(
     data: List[str] = None,
 ):
     print_function_args()
-    pipeline_run_finished_event_v1  = "cd.pipelinerun.finished.v1"
-    extensions = {
-        "pipelinerunid": id,
-        "pipelinerunname": name,
-        "pipelinerunstatus": status,
-        "pipelinerunurl": url,
-        "pipelinerunerrors": errors,
-    }
-
+    e = Events()
+    new_event = e.create_pipelinerun_event(event_type.PipelineRunFinishedEventV1, id, name, status, url, errors, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(pipeline_run_finished_event_v1, extensions, data)
+    cdevents_command.run(new_event)
 
 @click.command(help=add_disclaimer_text("PipelineRun Queued CloudEvent."))
 @common_pipelinerun_options
@@ -117,14 +106,8 @@ def queued(
     data: List[str] = None,
 ):
     print_function_args()
-    pipeline_run_queued_event_v1  = "cd.pipelinerun.queued.v1"
-    extensions = {
-        "pipelinerunid": id,
-        "pipelinerunname": name,
-        "pipelinerunstatus": status,
-        "pipelinerunurl": url,
-        "pipelinerunerrors": errors,
-    }
-
+    e = Events()
+    new_event = e.create_pipelinerun_event(event_type.PipelineRunQueuedEventV1, id, name, status, url, errors, data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(pipeline_run_queued_event_v1, extensions, data)
+    cdevents_command.run(new_event)
+