update execute method

Author: tarekbadrsh

cli/cdevents/cli/artifact.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.artifact import ArtifactEvent, ArtifactType
+from cdevents.core.artifact import ArtifactPackagedEvent, ArtifactPublishedEvent
 
 # pylint: disable=unused-argument
 def common_artifact_options(function):
@@ -53,7 +53,7 @@ def packaged(
     data: List[str] = None,
 ):
     print_function_args()
-    artifact_event = ArtifactEvent(ArtifactType.ArtifactPackagedEventV1, id, name, version, data=data)
+    artifact_event = ArtifactPackagedEvent(id, name, version, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(artifact_event)
 
@@ -67,6 +67,6 @@ def published(
     data: List[str] = None,
 ):
     print_function_args()
-    artifact_event = ArtifactEvent(ArtifactType.ArtifactPublishedEventV1, id, name, version, data=data)
+    artifact_event = ArtifactPublishedEvent(id, name, version, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(artifact_event)

cli/cdevents/cli/branch.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.branch import BranchEvent, BranchType
+from cdevents.core.branch import BranchCreatedEvent, BranchDeletedEvent
 
 # pylint: disable=unused-argument
 def common_branch_options(function):
@@ -53,7 +53,7 @@ def created(
     data: List[str] = None,
 ):
     print_function_args()
-    branch_event = BranchEvent(branch_type=BranchType.BranchCreatedEventV1, id=id, name=name, repoid=repoid, data=data)
+    branch_event = BranchCreatedEvent(id=id, name=name, repoid=repoid, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(branch_event)
 
@@ -67,6 +67,6 @@ def deleted(
     data: List[str] = None,
 ):
     print_function_args()
-    branch_event = BranchEvent(branch_type=BranchType.BranchDeletedEventV1, id=id, name=name, repoid=repoid, data=data)
+    branch_event = BranchDeletedEvent(id=id, name=name, repoid=repoid, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(branch_event)

cli/cdevents/cli/build.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.build import BuildEvent, BuildType
+from cdevents.core.build import BuildStartedEvent, BuildQueuedEvent, BuildFinishedEvent
 
 # pylint: disable=unused-argument
 def common_build_options(function):
@@ -54,7 +54,7 @@ def started(
     data: List[str] = None,
 ):
     print_function_args()
-    build_event = BuildEvent(build_type=BuildType.BuildStartedEventV1, id=id, name=name, artifact=artifact, data=data)
+    build_event = BuildStartedEvent(id=id, name=name, artifact=artifact, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(build_event)
 
@@ -67,7 +67,7 @@ def finished(
     data: List[str] = None,
 ):
     print_function_args()
-    build_event = BuildEvent(build_type=BuildType.BuildFinishedEventV1, id=id, name=name, artifact=artifact, data=data)
+    build_event = BuildQueuedEvent(id=id, name=name, artifact=artifact, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(build_event)
 
@@ -80,6 +80,6 @@ def queued(
     data: List[str] = None,
 ):
     print_function_args()
-    build_event = BuildEvent(build_type=BuildType.BuildQueuedEventV1, id=id, name=name, artifact=artifact, data=data)
+    build_event = BuildFinishedEvent(id=id, name=name, artifact=artifact, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(build_event)

cli/cdevents/cli/env.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.env import EnvEvent, EnvType
+from cdevents.core.env import EnvEventCreatedEvent, EnvEventModifiedEvent, EnvEventDeletedEvent
 
 # pylint: disable=unused-argument
 def common_env_options(function):
@@ -53,12 +53,10 @@ def created(
     data: List[str] = None,
 ):
     print_function_args()
-    env = EnvEvent(build_type=EnvType.EnvironmentCreatedEventV1, id=id, name=name, repo=repo, data=data)
-    env_event = env.create_event(data)
+    env_event = EnvEventCreatedEvent(id=id, name=name, repo=repo, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(env_event)
 
-
 @click.command(help=add_disclaimer_text("Environment Deleted CloudEvent."))
 @common_env_options
 def deleted(
@@ -68,7 +66,7 @@ def deleted(
     data: List[str] = None,
 ):
     print_function_args()
-    env_event = EnvEvent(env_type=EnvType.EnvironmentDeletedEventV1, id=id, name=name, repo=repo, data=data)
+    env_event = EnvEventModifiedEvent(id=id, name=name, repo=repo, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(env_event)
 
@@ -81,6 +79,6 @@ def modified(
     data: List[str] = None,
 ):
     print_function_args()
-    env_event = EnvEvent(env_type=EnvType.EnvironmentModifiedEventV1, id=id, name=name, repo=repo, data=data)
+    env_event = EnvEventDeletedEvent(id=id, name=name, repo=repo, data=data)
     cdevents_command = CDeventsCommand()
-    cdevents_command.run(env_event)
+    cdevents_command.run(env_event)

cli/cdevents/cli/pipelinerun.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.pipelinerun import PipelinerunEvent, PipelinerunType
+from cdevents.core.pipelinerun import PipelinerunStartedEvent, PipelinerunFinishedEvent, PipelinerunQueuedEvent
 
 # pylint: disable=unused-argument
 def common_pipelinerun_options(function):
@@ -69,7 +69,7 @@ def started(
     data: List[str] = None,
 ):
     print_function_args()
-    pipelinerun_event = PipelinerunEvent(PipelinerunType.PipelineRunStartedEventV1, id=id, name=name, status=status, url=url, errors=errors, data=data)
+    pipelinerun_event = PipelinerunStartedEvent(id=id, name=name, status=status, url=url, errors=errors, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(pipelinerun_event)
 
@@ -84,7 +84,7 @@ def finished(
     data: List[str] = None,
 ):
     print_function_args()
-    pipelinerun_event = PipelinerunEvent(PipelinerunType.PipelineRunFinishedEventV1, id=id, name=name, status=status, url=url, errors=errors, data=data)
+    pipelinerun_event = PipelinerunFinishedEvent(id=id, name=name, status=status, url=url, errors=errors, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(pipelinerun_event)
 
@@ -100,7 +100,7 @@ def queued(
     data: List[str] = None,
 ):
     print_function_args()
-    pipelinerun_event = PipelinerunEvent(PipelinerunType.PipelineRunQueuedEventV1, id=id, name=name, status=status, url=url, errors=errors, data=data)
+    pipelinerun_event = PipelinerunQueuedEvent(id=id, name=name, status=status, url=url, errors=errors, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(pipelinerun_event)
 

cli/cdevents/cli/repository.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.repository import RepositoryEvent, RepositoryType
+from cdevents.core.repository import RepositoryCreatedEvent, RepositoryModifiedEvent, RepositoryDeletedEvent
 
 # pylint: disable=unused-argument
 def common_repository_options(function):
@@ -53,7 +53,7 @@ def created(
     data: List[str] = None,
 ):
     print_function_args()
-    repository_event = RepositoryEvent(repository_type=RepositoryType.RepositoryCreatedEventV1, id=id, name=name, url=url, data=data)
+    repository_event = RepositoryCreatedEvent(id=id, name=name, url=url, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(repository_event)
 
@@ -67,7 +67,7 @@ def modified(
     data: List[str] = None,
 ):
     print_function_args()
-    repository_event = RepositoryEvent(repository_type=RepositoryType.RepositoryModifiedEventV1, id=id, name=name, url=url, data=data)
+    repository_event = RepositoryModifiedEvent(id=id, name=name, url=url, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(repository_event)
 
@@ -81,7 +81,7 @@ def deleted(
     data: List[str] = None,
 ):
     print_function_args()
-    repository_event = RepositoryEvent(repository_type=RepositoryType.RepositoryDeletedEventV1, id=id, name=name, url=url, data=data)
+    repository_event = RepositoryDeletedEvent(id=id, name=name, url=url, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(repository_event)
 

cli/cdevents/cli/service.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.service import ServiceEvent, ServiceType
+from cdevents.core.service import ServiceDeployedEvent, ServiceUpgradedEvent, ServiceRolledbackEvent, ServiceRemovedEvent
 
 # pylint: disable=unused-argument
 def common_service_options(function):
@@ -53,7 +53,7 @@ def deployed(
     data: List[str] = None,
 ):
     print_function_args()
-    service_event = ServiceEvent(service_type=ServiceType.ServiceDeployedEventV1, envid=envid, name=name, version=version, data=data)
+    service_event = ServiceDeployedEvent(envid=envid, name=name, version=version, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(service_event)
 
@@ -66,34 +66,32 @@ def upgraded(
     data: List[str] = None,
 ):
     print_function_args()
-    service_event = ServiceEvent(service_type=ServiceType.ServiceUpgradedEventV1, envid=envid, name=name, version=version, data=data)
+    service_event = ServiceUpgradedEvent(envid=envid, name=name, version=version, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(service_event)
 
-
-@click.command(help=add_disclaimer_text("Service Removed CloudEvent."))
+@click.command(help=add_disclaimer_text("Service Rolledback CloudEvent."))
 @common_service_options
-def removed(
+def rolledback(
     envid: str,
     name: str = None,
     version: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    service_event = ServiceEvent(service_type=ServiceType.ServiceRemovedEventV1, envid=envid, name=name, version=version, data=data)
+    service_event = ServiceRolledbackEvent(envid=envid, name=name, version=version, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(service_event)
 
-
-@click.command(help=add_disclaimer_text("Service Rolledback CloudEvent."))
+@click.command(help=add_disclaimer_text("Service Removed CloudEvent."))
 @common_service_options
-def rolledback(
+def removed(
     envid: str,
     name: str = None,
     version: str = None,
     data: List[str] = None,
 ):
     print_function_args()
-    service_event = ServiceEvent(service_type=ServiceType.ServiceRolledbackEventV1, envid=envid, name=name, version=version, data=data)
+    service_event = ServiceRemovedEvent(envid=envid, name=name, version=version, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(service_event)

cli/cdevents/cli/taskrun.py

@@ -6,7 +6,7 @@
 from cdevents.cli.utils import add_disclaimer_text, print_function_args
 from cdevents.cli.cdevents_command import CDeventsCommand
 
-from cdevents.core.taskrun import TaskRunEvent, TaskRunType
+from cdevents.core.taskrun import TaskRunStartedEvent, TaskRunFinishedEvent
 
 # pylint: disable=unused-argument
 def common_taskrun_options(function):
@@ -53,7 +53,7 @@ def started(
     data: List[str] = None,
 ):
     print_function_args()
-    taskrun_event = TaskRunEvent(taskrun_type=TaskRunType.TaskRunStartedEventV1, id=id, name=name, pipelineid=pipelineid, data=data)
+    taskrun_event = TaskRunStartedEvent(id=id, name=name, pipelineid=pipelineid, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(taskrun_event)
 
@@ -66,7 +66,7 @@ def finished(
     data: List[str] = None,
 ):
     print_function_args()
-    taskrun_event = TaskRunEvent(taskrun_type=TaskRunType.TaskRunFinishedEventV1, id=id, name=name, pipelineid=pipelineid, data=data)
+    taskrun_event = TaskRunFinishedEvent(id=id, name=name, pipelineid=pipelineid, data=data)
     cdevents_command = CDeventsCommand()
     cdevents_command.run(taskrun_event)
 

core/cdevents/core/artifact.py

@@ -29,3 +29,21 @@ def create_extensions(self) -> dict:
             "artifactversion": self._version,
         }
         return extensions
+
+class ArtifactPackagedEvent(ArtifactEvent):
+    
+    def __init__(self, id: str, name: str, version: str, data: dict = {}):
+        """Initializes class.
+        """
+        self._event_type: str = ArtifactType.ArtifactPackagedEventV1
+
+        super().__init__(artifact_type=self._event_type, id=id, name=name, version=version, data=data)
+
+class ArtifactPublishedEvent(ArtifactEvent):
+    
+    def __init__(self, id: str, name: str, version: str, data: dict = {}):
+        """Initializes class.
+        """
+        self._event_type: str = ArtifactType.ArtifactPublishedEventV1
+
+        super().__init__(artifact_type=self._event_type, id=id, name=name, version=version, data=data)

core/cdevents/core/branch.py

@@ -30,21 +30,20 @@ def create_extensions(self) -> dict:
         }
         return extensions
 
-# TODO: Add tests for this class.
 class BranchCreatedEvent(BranchEvent):
 
     def __init__(self, id: str, name: str, repoid: str, data: dict = {}):
         """Initializes class.
         """
-        self._event_type : str = "cd.repository.branch.created.v1"
+        self._event_type: str = BranchType.BranchCreatedEventV1
 
-        super().__init__(event_type=self._event_type, id=id, name=name, repoid=repoid, data=data)
+        super().__init__(branch_type=self._event_type, id=id, name=name, repoid=repoid, data=data)
 
 class BranchDeletedEvent(BranchEvent):
 
     def __init__(self, id: str, name: str, repoid: str, data: dict = {}):
         """Initializes class.
         """
-        self._event_type : str = "cd.repository.branch.deleted.v1"
+        self._event_type: str = BranchType.BranchDeletedEventV1
 
-        super().__init__(event_type=self._event_type, id=id, name=name, repoid=repoid, data=data)
+        super().__init__(branch_type=self._event_type, id=id, name=name, repoid=repoid, data=data)