Skip to content

Commit 7f28c8f

Browse files
tarekbadrshafrittoli
tarekbadrsh
authored and
afrittoli
committed
Update def __init__
1 parent 44f6f22 commit 7f28c8f

26 files changed

+82
-190
lines changed

‎cli/cdevents/cli/artifact.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ def packaged(
5353
data: List[str] = None,
5454
):
5555
print_function_args()
56-
artifact = Artifact(ArtifactType.ArtifactPackagedEventV1, id, name, version)
57-
artifact_event = artifact.create_event(data)
56+
artifact_event = Artifact(ArtifactType.ArtifactPackagedEventV1, id, name, version, data=data)
5857
cdevents_command = CDeventsCommand()
5958
cdevents_command.run(artifact_event)
6059

@@ -68,7 +67,6 @@ def published(
6867
data: List[str] = None,
6968
):
7069
print_function_args()
71-
artifact = Artifact(ArtifactType.ArtifactPublishedEventV1, id, name, version)
72-
artifact_event = artifact.create_event(data)
70+
artifact_event = Artifact(ArtifactType.ArtifactPublishedEventV1, id, name, version, data=data)
7371
cdevents_command = CDeventsCommand()
7472
cdevents_command.run(artifact_event)

‎cli/cdevents/cli/branch.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ def created(
5353
data: List[str] = None,
5454
):
5555
print_function_args()
56-
branch = Branch(branch_type=BranchType.BranchCreatedEventV1, id=id, name=name, repoid=repoid)
57-
branch_event = branch.create_event(data)
56+
branch_event = Branch(branch_type=BranchType.BranchCreatedEventV1, id=id, name=name, repoid=repoid, data=data)
5857
cdevents_command = CDeventsCommand()
5958
cdevents_command.run(branch_event)
6059

@@ -68,7 +67,6 @@ def deleted(
6867
data: List[str] = None,
6968
):
7069
print_function_args()
71-
branch = Branch(branch_type=BranchType.BranchDeletedEventV1, id=id, name=name, repoid=repoid)
72-
branch_event = branch.create_event(data)
70+
branch_event = Branch(branch_type=BranchType.BranchDeletedEventV1, id=id, name=name, repoid=repoid, data=data)
7371
cdevents_command = CDeventsCommand()
7472
cdevents_command.run(branch_event)

‎cli/cdevents/cli/build.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ def started(
5454
data: List[str] = None,
5555
):
5656
print_function_args()
57-
build = Build(build_type=BuildType.BuildStartedEventV1, id=id, name=name, artifact=artifact)
58-
build_event = build.create_event(data)
57+
build_event = Build(build_type=BuildType.BuildStartedEventV1, id=id, name=name, artifact=artifact, data=data)
5958
cdevents_command = CDeventsCommand()
6059
cdevents_command.run(build_event)
6160

@@ -68,8 +67,7 @@ def finished(
6867
data: List[str] = None,
6968
):
7069
print_function_args()
71-
build = Build(build_type=BuildType.BuildFinishedEventV1, id=id, name=name, artifact=artifact)
72-
build_event = build.create_event(data)
70+
build_event = Build(build_type=BuildType.BuildFinishedEventV1, id=id, name=name, artifact=artifact, data=data)
7371
cdevents_command = CDeventsCommand()
7472
cdevents_command.run(build_event)
7573

@@ -82,7 +80,6 @@ def queued(
8280
data: List[str] = None,
8381
):
8482
print_function_args()
85-
build = Build(build_type=BuildType.BuildQueuedEventV1, id=id, name=name, artifact=artifact)
86-
build_event = build.create_event(data)
83+
build_event = Build(build_type=BuildType.BuildQueuedEventV1, id=id, name=name, artifact=artifact, data=data)
8784
cdevents_command = CDeventsCommand()
8885
cdevents_command.run(build_event)

‎cli/cdevents/cli/env.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def created(
5353
data: List[str] = None,
5454
):
5555
print_function_args()
56-
env = Env(build_type=EnvType.EnvironmentCreatedEventV1, id=id, name=name, repo=repo)
56+
env = Env(build_type=EnvType.EnvironmentCreatedEventV1, id=id, name=name, repo=repo, data=data)
5757
env_event = env.create_event(data)
5858
cdevents_command = CDeventsCommand()
5959
cdevents_command.run(env_event)
@@ -68,8 +68,7 @@ def deleted(
6868
data: List[str] = None,
6969
):
7070
print_function_args()
71-
env = Env(env_type=EnvType.EnvironmentDeletedEventV1, id=id, name=name, repo=repo)
72-
env_event = env.create_event(data)
71+
env_event = Env(env_type=EnvType.EnvironmentDeletedEventV1, id=id, name=name, repo=repo, data=data)
7372
cdevents_command = CDeventsCommand()
7473
cdevents_command.run(env_event)
7574

@@ -82,7 +81,6 @@ def modified(
8281
data: List[str] = None,
8382
):
8483
print_function_args()
85-
env = Env(env_type=EnvType.EnvironmentModifiedEventV1, id=id, name=name, repo=repo)
86-
env_event = env.create_event(data)
84+
env_event = Env(env_type=EnvType.EnvironmentModifiedEventV1, id=id, name=name, repo=repo, data=data)
8785
cdevents_command = CDeventsCommand()
8886
cdevents_command.run(env_event)

‎cli/cdevents/cli/pipelinerun.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,7 @@ def started(
6969
data: List[str] = None,
7070
):
7171
print_function_args()
72-
pipelinerun = Pipelinerun(PipelinerunType.PipelineRunStartedEventV1, id=id, name=name, status=status, url=url, errors=errors)
73-
pipelinerun_event = pipelinerun.create_event(data)
72+
pipelinerun_event = Pipelinerun(PipelinerunType.PipelineRunStartedEventV1, id=id, name=name, status=status, url=url, errors=errors, data=data)
7473
cdevents_command = CDeventsCommand()
7574
cdevents_command.run(pipelinerun_event)
7675

@@ -85,8 +84,7 @@ def finished(
8584
data: List[str] = None,
8685
):
8786
print_function_args()
88-
pipelinerun = Pipelinerun(PipelinerunType.PipelineRunFinishedEventV1, id=id, name=name, status=status, url=url, errors=errors)
89-
pipelinerun_event = pipelinerun.create_event(data)
87+
pipelinerun_event = Pipelinerun(PipelinerunType.PipelineRunFinishedEventV1, id=id, name=name, status=status, url=url, errors=errors, data=data)
9088
cdevents_command = CDeventsCommand()
9189
cdevents_command.run(pipelinerun_event)
9290

@@ -102,8 +100,7 @@ def queued(
102100
data: List[str] = None,
103101
):
104102
print_function_args()
105-
pipelinerun = Pipelinerun(PipelinerunType.PipelineRunQueuedEventV1, id=id, name=name, status=status, url=url, errors=errors)
106-
pipelinerun_event = pipelinerun.create_event(data)
103+
pipelinerun_event = Pipelinerun(PipelinerunType.PipelineRunQueuedEventV1, id=id, name=name, status=status, url=url, errors=errors, data=data)
107104
cdevents_command = CDeventsCommand()
108105
cdevents_command.run(pipelinerun_event)
109106

‎cli/cdevents/cli/repository.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ def created(
5353
data: List[str] = None,
5454
):
5555
print_function_args()
56-
repository = Repository(repository_type=RepositoryType.RepositoryCreatedEventV1, id=id, name=name, url=url)
57-
repository_event = repository.create_event(data)
56+
repository_event = Repository(repository_type=RepositoryType.RepositoryCreatedEventV1, id=id, name=name, url=url, data=data)
5857
cdevents_command = CDeventsCommand()
5958
cdevents_command.run(repository_event)
6059

@@ -68,8 +67,7 @@ def modified(
6867
data: List[str] = None,
6968
):
7069
print_function_args()
71-
repository = Repository(repository_type=RepositoryType.RepositoryModifiedEventV1, id=id, name=name, url=url)
72-
repository_event = repository.create_event(data)
70+
repository_event = Repository(repository_type=RepositoryType.RepositoryModifiedEventV1, id=id, name=name, url=url, data=data)
7371
cdevents_command = CDeventsCommand()
7472
cdevents_command.run(repository_event)
7573

@@ -83,8 +81,7 @@ def deleted(
8381
data: List[str] = None,
8482
):
8583
print_function_args()
86-
repository = Repository(repository_type=RepositoryType.RepositoryDeletedEventV1, id=id, name=name, url=url)
87-
repository_event = repository.create_event(data)
84+
repository_event = Repository(repository_type=RepositoryType.RepositoryDeletedEventV1, id=id, name=name, url=url, data=data)
8885
cdevents_command = CDeventsCommand()
8986
cdevents_command.run(repository_event)
9087

‎cli/cdevents/cli/service.py‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ def deployed(
5353
data: List[str] = None,
5454
):
5555
print_function_args()
56-
service = Service(service_type=ServiceType.ServiceDeployedEventV1, envid=envid, name=name, version=version)
57-
service_event = service.create_event(data)
56+
service_event = Service(service_type=ServiceType.ServiceDeployedEventV1, envid=envid, name=name, version=version, data=data)
5857
cdevents_command = CDeventsCommand()
5958
cdevents_command.run(service_event)
6059

@@ -67,8 +66,7 @@ def upgraded(
6766
data: List[str] = None,
6867
):
6968
print_function_args()
70-
service = Service(service_type=ServiceType.ServiceUpgradedEventV1, envid=envid, name=name, version=version)
71-
service_event = service.create_event(data)
69+
service_event = Service(service_type=ServiceType.ServiceUpgradedEventV1, envid=envid, name=name, version=version, data=data)
7270
cdevents_command = CDeventsCommand()
7371
cdevents_command.run(service_event)
7472

@@ -82,8 +80,7 @@ def removed(
8280
data: List[str] = None,
8381
):
8482
print_function_args()
85-
service = Service(service_type=ServiceType.ServiceRemovedEventV1, envid=envid, name=name, version=version)
86-
service_event = service.create_event(data)
83+
service_event = Service(service_type=ServiceType.ServiceRemovedEventV1, envid=envid, name=name, version=version, data=data)
8784
cdevents_command = CDeventsCommand()
8885
cdevents_command.run(service_event)
8986

@@ -97,7 +94,6 @@ def rolledback(
9794
data: List[str] = None,
9895
):
9996
print_function_args()
100-
service = Service(service_type=ServiceType.ServiceRolledbackEventV1, envid=envid, name=name, version=version)
101-
service_event = service.create_event(data)
97+
service_event = Service(service_type=ServiceType.ServiceRolledbackEventV1, envid=envid, name=name, version=version, data=data)
10298
cdevents_command = CDeventsCommand()
10399
cdevents_command.run(service_event)

‎cli/cdevents/cli/taskrun.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ def started(
5353
data: List[str] = None,
5454
):
5555
print_function_args()
56-
taskrun = TaskRun(taskrun_type=TaskRunType.TaskRunStartedEventV1, id=id, name=name, pipelineid=pipelineid)
57-
taskrun_event = taskrun.create_event(data)
56+
taskrun_event = TaskRun(taskrun_type=TaskRunType.TaskRunStartedEventV1, id=id, name=name, pipelineid=pipelineid, data=data)
5857
cdevents_command = CDeventsCommand()
5958
cdevents_command.run(taskrun_event)
6059

@@ -67,8 +66,7 @@ def finished(
6766
data: List[str] = None,
6867
):
6968
print_function_args()
70-
taskrun = TaskRun(taskrun_type=TaskRunType.TaskRunFinishedEventV1, id=id, name=name, pipelineid=pipelineid)
71-
taskrun_event = taskrun.create_event(data)
69+
taskrun_event = TaskRun(taskrun_type=TaskRunType.TaskRunFinishedEventV1, id=id, name=name, pipelineid=pipelineid, data=data)
7270
cdevents_command = CDeventsCommand()
7371
cdevents_command.run(taskrun_event)
7472

‎core/cdevents/core/artifact.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ class ArtifactType(Enum):
1111
class Artifact(Events):
1212
"""Artifact."""
1313

14-
def __init__(self, artifact_type: ArtifactType, id: str, name: str, version: str):
14+
def __init__(self, artifact_type: ArtifactType, id: str, name: str, version: str, data: dict = {}):
1515
"""Initializes class.
1616
"""
1717
self._event_type = artifact_type
1818
self._id = id
1919
self._name = name
2020
self._version = version
21+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=data)
2122

22-
def create_extensions(self):
23+
def create_extensions(self) -> dict:
2324
"""Create extensions.
2425
"""
2526
extensions = {
@@ -28,10 +29,3 @@ def create_extensions(self):
2829
"artifactversion": self._version,
2930
}
3031
return extensions
31-
32-
def create_event(self, data: dict={}):
33-
"""Create artifact event.
34-
"""
35-
extensions = self.create_extensions()
36-
event = super().create_event(event_type=self._event_type.value, extensions=extensions, data=data)
37-
return event

‎core/cdevents/core/branch.py‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,16 @@ class BranchType(Enum):
1111
class Branch(Events):
1212
"""Brach."""
1313

14-
def __init__(self, branch_type: BranchType, id: str, name: str, repoid: str):
14+
def __init__(self, branch_type: BranchType, id: str, name: str, repoid: str, data: dict = {}):
1515
"""Initializes class.
1616
"""
1717
self._event_type = branch_type
1818
self._id = id
1919
self._name = name
2020
self._repoid = repoid
21+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=data)
2122

22-
def create_extensions(self):
23+
def create_extensions(self) -> dict:
2324
"""Create extensions.
2425
"""
2526
extensions = {
@@ -28,10 +29,3 @@ def create_extensions(self):
2829
"branchrepositoryid": self._repoid,
2930
}
3031
return extensions
31-
32-
def create_event(self, data: dict={}):
33-
"""Create branch event.
34-
"""
35-
extensions = self.create_extensions()
36-
event = super().create_event(event_type=self._event_type.value, extensions=extensions, data=data)
37-
return event

0 commit comments

Comments
 (0)