Skip to content

Commit b9ab1fe

Browse files
tarekbadrshafrittoli
tarekbadrsh
authored and
afrittoli
committed
Update creating http object
1 parent b68c49e commit b9ab1fe

File tree

9 files changed

+119
-202
lines changed

9 files changed

+119
-202
lines changed

‎core/cdevents/core/artifact.py‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,14 @@
66
class ArtifactEvent(Event):
77
"""Artifact Event."""
88

9-
def __init__(self, **kwargs):
9+
def __init__(self, artifact_type: EventType, id: str=None, name: str=None, version: str=None, attrs=None, data: dict = {}):
1010
"""Initializes class.
1111
"""
12-
self._event_type : EventType = kwargs['artifact_type']
13-
if 'data' in kwargs:
14-
self._data :dict = kwargs['data']
15-
16-
if 'id' in kwargs and 'name' in kwargs and 'version' in kwargs:
17-
self._id :str = kwargs['id']
18-
self._name :str = kwargs['name']
19-
self._version :str = kwargs['version']
20-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
21-
22-
elif 'extensions' in kwargs:
23-
self._id = kwargs['extensions'].get('artifactid')
24-
self._name = kwargs['extensions'].get('artifactname')
25-
self._version = kwargs['extensions'].get('artifactversion')
26-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
12+
self._event_type = artifact_type
13+
self._id = id
14+
self._name = name
15+
self._version = version
16+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), attrs=attrs, data=data)
2717

2818
def create_extensions(self) -> dict:
2919
"""Create extensions.
@@ -37,18 +27,19 @@ def create_extensions(self) -> dict:
3727

3828
class ArtifactPackagedEvent(ArtifactEvent):
3929

40-
def __init__(self, **kwargs):
30+
def __init__(self, id: str=None, name: str=None, version: str=None, attrs=None, data: dict = {}):
4131
"""Initializes class.
4232
"""
4333
self._event_type: str = EventType.ArtifactPackagedEventV1
4434

45-
super().__init__(artifact_type=self._event_type, **kwargs)
35+
super().__init__(artifact_type=self._event_type, id=id, name=name, version=version, attrs=attrs, data=data)
36+
4637

4738
class ArtifactPublishedEvent(ArtifactEvent):
4839

49-
def __init__(self, **kwargs):
40+
def __init__(self, id: str=None, name: str=None, version: str=None, attrs=None, data: dict = {}):
5041
"""Initializes class.
5142
"""
5243
self._event_type: str = EventType.ArtifactPublishedEventV1
5344

54-
super().__init__(artifact_type=self._event_type, **kwargs)
45+
super().__init__(artifact_type=self._event_type, id=id, name=name, version=version, attrs=attrs, data=data)

‎core/cdevents/core/branch.py‎

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,14 @@
66
class BranchEvent(Event):
77
"""Branch Event."""
88

9-
def __init__(self, **kwargs):
9+
def __init__(self, branch_type: EventType, id: str=None, name: str=None, repoid: str=None, attrs=None, data: dict = {}):
1010
"""Initializes class.
1111
"""
12-
self._event_type : EventType = kwargs['branch_type']
13-
14-
if 'data' in kwargs:
15-
self._data :dict = kwargs['data']
16-
17-
if 'id' in kwargs and 'name' in kwargs and 'repoid' in kwargs:
18-
self._id :str = kwargs['id']
19-
self._name :str = kwargs['name']
20-
self._repoid :str = kwargs['repoid']
21-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
22-
elif 'extensions' in kwargs:
23-
self._id = kwargs['extensions'].get('branchid')
24-
self._name = kwargs['extensions'].get('branchname')
25-
self._repoid = kwargs['extensions'].get('branchrepositoryid')
26-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
12+
self._event_type = branch_type
13+
self._id = id
14+
self._name = name
15+
self._repoid = repoid
16+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), attrs=attrs, data=data)
2717

2818
def create_extensions(self) -> dict:
2919
"""Create extensions.
@@ -37,18 +27,18 @@ def create_extensions(self) -> dict:
3727

3828
class BranchCreatedEvent(BranchEvent):
3929

40-
def __init__(self, **kwargs):
30+
def __init__(self, id: str=None, name: str=None, repoid: str=None, attrs=None, data: dict = {}):
4131
"""Initializes class.
4232
"""
4333
self._event_type: str = EventType.BranchCreatedEventV1
4434

45-
super().__init__(branch_type=self._event_type, **kwargs)
35+
super().__init__(branch_type=self._event_type, id=id, name=name, repoid=repoid, attrs=attrs, data=data)
4636

4737
class BranchDeletedEvent(BranchEvent):
4838

49-
def __init__(self, **kwargs):
39+
def __init__(self, id: str=None, name: str=None, repoid: str=None, attrs=None, data: dict = {}):
5040
"""Initializes class.
5141
"""
5242
self._event_type: str = EventType.BranchDeletedEventV1
5343

54-
super().__init__(branch_type=self._event_type, **kwargs)
44+
super().__init__(branch_type=self._event_type, id=id, name=name, repoid=repoid, attrs=attrs, data=data)

‎core/cdevents/core/build.py‎

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,14 @@
66
class BuildEvent(Event):
77
"""Build Event."""
88

9-
def __init__(self, **kwargs):
9+
def __init__(self, build_type: EventType, id: str=None, name: str=None, artifact: str=None, attrs=None, data: dict = {}):
1010
"""Initializes class.
1111
"""
12-
self._event_type : EventType = kwargs['build_type']
13-
if 'data' in kwargs:
14-
self._data :dict = kwargs['data']
15-
16-
if 'id' in kwargs and 'name' in kwargs and 'artifact' in kwargs:
17-
self._id :str = kwargs['id']
18-
self._name :str = kwargs['name']
19-
self._artifact :str = kwargs['artifact']
20-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
21-
22-
elif 'extensions' in kwargs:
23-
self._id = kwargs['extensions'].get('buildid'),
24-
self._name = kwargs['extensions'].get('buildname')
25-
self._artifact = kwargs['extensions'].get('buildartifactid')
26-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), attrs=kwargs['attrs'], data=self._data)
12+
self._event_type = build_type
13+
self._id = id
14+
self._name = name
15+
self._artifact = artifact
16+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), attrs=attrs, data=data)
2717

2818
def create_extensions(self) -> dict:
2919
"""Create extensions.
@@ -37,27 +27,27 @@ def create_extensions(self) -> dict:
3727

3828
class BuildStartedEvent(BuildEvent):
3929
"""Build Started Event."""
40-
def __init__(self, **kwargs):
30+
def __init__(self, id: str=None, name: str=None, artifact: str=None, attrs=None, data: dict = {}):
4131
"""Initializes class.
4232
"""
4333
self._event_type: str = EventType.BuildStartedEventV1
4434

45-
super().__init__(build_type=self._event_type, **kwargs)
35+
super().__init__(build_type=self._event_type, id=id, name=name, artifact=artifact, attrs=attrs, data=data)
4636

4737
class BuildQueuedEvent(BuildEvent):
4838
"""Build Queued Event."""
49-
def __init__(self, **kwargs):
39+
def __init__(self, id: str=None, name: str=None, artifact: str=None, attrs=None, data: dict = {}):
5040
"""Initializes class.
5141
"""
5242
self._event_type: str = EventType.BuildQueuedEventV1
5343

54-
super().__init__(build_type=self._event_type, **kwargs)
44+
super().__init__(build_type=self._event_type, id=id, name=name, artifact=artifact, attrs=attrs, data=data)
5545

5646
class BuildFinishedEvent(BuildEvent):
5747
"""Build Finished Event."""
58-
def __init__(self, **kwargs):
48+
def __init__(self, id: str=None, name: str=None, artifact: str=None, attrs=None, data: dict = {}):
5949
"""Initializes class.
6050
"""
6151
self._event_type: str = EventType.BuildFinishedEventV1
6252

63-
super().__init__(build_type=self._event_type, **kwargs)
53+
super().__init__(build_type=self._event_type, id=id, name=name, artifact=artifact, attrs=attrs, data=data)

‎core/cdevents/core/env.py‎

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,14 @@
66
class EnvEvent(Event):
77
"""Env Event."""
88

9-
def __init__(self, **kwargs):
9+
def __init__(self, env_type: EventType, id: str, name: str, repo: str, attrs=None, data: dict = {}):
1010
"""Initializes class.
1111
"""
12-
self._event_type : EventType = kwargs['env_type']
13-
if 'data' in kwargs:
14-
self._data :dict = kwargs['data']
15-
16-
if 'id' in kwargs and 'name' in kwargs and 'repo' in kwargs:
17-
self._id :str = kwargs['id']
18-
self._name :str = kwargs['name']
19-
self._repo :str = kwargs['repo']
20-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
21-
22-
elif 'extensions' in kwargs:
23-
self._id = kwargs['extensions'].get('envId')
24-
self._name = kwargs['extensions'].get('envname')
25-
self._repo = kwargs['extensions'].get('envrepourl')
26-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
12+
self._event_type = env_type
13+
self._id = id
14+
self._name = name
15+
self._repo = repo
16+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), attrs=attrs, data=data)
2717

2818
def create_extensions(self) -> dict:
2919
"""Create extensions.
@@ -37,29 +27,28 @@ def create_extensions(self) -> dict:
3727

3828
class EnvEventCreatedEvent(EnvEvent):
3929

40-
def __init__(self, **kwargs):
30+
def __init__(self, id: str=None, name: str=None, repo: str=None, attrs=None, data: dict = {}):
4131
"""Initializes class.
4232
"""
4333
self._event_type: str = EventType.EnvironmentCreatedEventV1
4434

45-
super().__init__(env_type=self._event_type, **kwargs)
35+
super().__init__(env_type=self._event_type, id=id, name=name, repo=repo, attrs=attrs, data=data)
4636

4737
class EnvEventModifiedEvent(EnvEvent):
4838

49-
def __init__(self, **kwargs):
39+
def __init__(self, id: str=None, name: str=None, repo: str=None, attrs=None, data: dict = {}):
5040
"""Initializes class.
5141
"""
5242
self._event_type: str = EventType.EnvironmentModifiedEventV1
5343

54-
super().__init__(env_type=self._event_type, **kwargs)
55-
44+
super().__init__(env_type=self._event_type, id=id, name=name, repo=repo, attrs=attrs, data=data)
5645

5746
class EnvEventDeletedEvent(EnvEvent):
5847

59-
def __init__(self, **kwargs):
48+
def __init__(self, id: str=None, name: str=None, repo: str=None, attrs=None, data: dict = {}):
6049
"""Initializes class.
6150
"""
6251
self._event_type: str = EventType.EnvironmentDeletedEventV1
6352

64-
super().__init__(env_type=self._event_type, **kwargs)
53+
super().__init__(env_type=self._event_type, id=id, name=name, repo=repo, attrs=attrs, data=data)
6554

‎core/cdevents/core/http_handlar.py‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,54 +105,53 @@ def event_from_http(headers: typing.Dict[str, str],
105105
attrs = HttpHandlar.get_attrs(headers, data, data_unmarshaller)
106106

107107
event_data=attrs.pop("data", None)
108-
extensions=attrs.pop("extensions", None)
109108

110109
etype = EventType(attrs.get("type"))
111110
if etype.value == "" or etype.value is None:
112111
raise cloud_exceptions.MissingRequiredFields(
113112
"Failed to find type in HTTP request"
114113
)
115114
elif etype.value == EventType.ArtifactPackagedEventV1.value:
116-
return ArtifactPackagedEvent(attrs=attrs, extensions=extensions, data=event_data)
115+
return ArtifactPackagedEvent(attrs=attrs, data=event_data)
117116
elif etype.value == EventType.ArtifactPublishedEventV1.value:
118-
return ArtifactPublishedEvent(attrs=attrs, extensions=extensions, data=event_data)
117+
return ArtifactPublishedEvent(attrs=attrs, data=event_data)
119118
elif etype.value == EventType.BranchCreatedEventV1.value:
120-
return BranchCreatedEvent(attrs=attrs, extensions=extensions, data=event_data)
119+
return BranchCreatedEvent(attrs=attrs, data=event_data)
121120
elif etype.value == EventType.BranchDeletedEventV1.value:
122-
return BranchDeletedEvent(attrs=attrs, extensions=extensions, data=event_data)
121+
return BranchDeletedEvent(attrs=attrs, data=event_data)
123122
elif etype.value == EventType.BuildStartedEventV1.value:
124-
return BuildStartedEvent(attrs=attrs, extensions=extensions, data=event_data)
123+
return BuildStartedEvent(attrs=attrs, data=event_data)
125124
elif etype.value == EventType.BuildQueuedEventV1.value:
126-
return BuildQueuedEvent(attrs=attrs, extensions=extensions, data=event_data)
125+
return BuildQueuedEvent(attrs=attrs, data=event_data)
127126
elif etype.value == EventType.BuildFinishedEventV1.value:
128-
return BuildFinishedEvent(attrs=attrs, extensions=extensions, data=event_data)
127+
return BuildFinishedEvent(attrs=attrs, data=event_data)
129128
elif etype.value == EventType.EnvironmentCreatedEventV1.value:
130-
return EnvEventCreatedEvent(attrs=attrs, extensions=extensions, data=event_data)
129+
return EnvEventCreatedEvent(attrs=attrs, data=event_data)
131130
elif etype.value == EventType.EnvironmentModifiedEventV1.value:
132-
return EnvEventModifiedEvent(attrs=attrs, extensions=extensions, data=event_data)
131+
return EnvEventModifiedEvent(attrs=attrs, data=event_data)
133132
elif etype.value == EventType.EnvironmentDeletedEventV1.value:
134-
return EnvEventDeletedEvent(attrs=attrs, extensions=extensions, data=event_data)
133+
return EnvEventDeletedEvent(attrs=attrs, data=event_data)
135134
elif etype.value == EventType.PipelineRunStartedEventV1.value:
136-
return PipelinerunStartedEvent(attrs=attrs, extensions=extensions, data=event_data)
135+
return PipelinerunStartedEvent(attrs=attrs, data=event_data)
137136
elif etype.value == EventType.PipelineRunFinishedEventV1.value:
138-
return PipelinerunFinishedEvent(attrs=attrs, extensions=extensions, data=event_data)
137+
return PipelinerunFinishedEvent(attrs=attrs, data=event_data)
139138
elif etype.value == EventType.PipelineRunQueuedEventV1.value:
140-
return PipelinerunQueuedEvent(attrs=attrs, extensions=extensions, data=event_data)
139+
return PipelinerunQueuedEvent(attrs=attrs, data=event_data)
141140
elif etype.value == EventType.RepositoryCreatedEventV1.value:
142-
return RepositoryCreatedEvent(attrs=attrs, extensions=extensions, data=event_data)
141+
return RepositoryCreatedEvent(attrs=attrs, data=event_data)
143142
elif etype.value == EventType.RepositoryModifiedEventV1.value:
144-
return RepositoryModifiedEvent(attrs=attrs, extensions=extensions, data=event_data)
143+
return RepositoryModifiedEvent(attrs=attrs, data=event_data)
145144
elif etype.value == EventType.RepositoryDeletedEventV1.value:
146-
return RepositoryDeletedEvent(attrs=attrs, extensions=extensions, data=event_data)
145+
return RepositoryDeletedEvent(attrs=attrs, data=event_data)
147146
elif etype.value == EventType.ServiceDeployedEventV1.value:
148-
return ServiceDeployedEvent(attrs=attrs, extensions=extensions, data=event_data)
147+
return ServiceDeployedEvent(attrs=attrs, data=event_data)
149148
elif etype.value == EventType.ServiceUpgradedEventV1.value:
150-
return ServiceUpgradedEvent(attrs=attrs, extensions=extensions, data=event_data)
149+
return ServiceUpgradedEvent(attrs=attrs, data=event_data)
151150
elif etype.value == EventType.ServiceRolledbackEventV1.value:
152-
return ServiceRolledbackEvent(attrs=attrs, extensions=extensions, data=event_data)
151+
return ServiceRolledbackEvent(attrs=attrs, data=event_data)
153152
elif etype.value == EventType.ServiceRemovedEventV1.value:
154-
return ServiceRemovedEvent(attrs=attrs, extensions=extensions, data=event_data)
153+
return ServiceRemovedEvent(attrs=attrs, data=event_data)
155154
elif etype.value == EventType.TaskRunStartedEventV1.value:
156-
return TaskRunStartedEvent(attrs=attrs, extensions=extensions, data=event_data)
155+
return TaskRunStartedEvent(attrs=attrs, data=event_data)
157156
elif etype.value == EventType.TaskRunFinishedEventV1.value:
158-
return TaskRunFinishedEvent(attrs=attrs, extensions=extensions, data=event_data)
157+
return TaskRunFinishedEvent(attrs=attrs, data=event_data)

‎core/cdevents/core/pipelinerun.py‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,16 @@
66
class PipelinerunEvent(Event):
77
"""Pipelinerun Event."""
88

9-
def __init__(self, **kwargs):
9+
def __init__(self, pipelinerun_type: EventType, id: str, name: str, status: str, url: str, errors: str, attrs=None, data: dict = {}):
1010
"""Initializes class.
1111
"""
12-
self._event_type : EventType = kwargs['pipelinerun_type']
13-
if 'data' in kwargs:
14-
self._data :dict = kwargs['data']
15-
16-
if 'id' in kwargs and 'name' in kwargs and 'status' in kwargs and 'url' in kwargs and 'errors' in kwargs:
17-
self._id :str = kwargs['id']
18-
self._name :str = kwargs['name']
19-
self._status :str = kwargs['status']
20-
self._url :str = kwargs['url']
21-
self._errors :str = kwargs['errors']
22-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
23-
24-
elif 'extensions' in kwargs:
25-
self._id = kwargs['extensions'].get('pipelinerunid')
26-
self._name = kwargs['extensions'].get('pipelinerunname')
27-
self._status = kwargs['extensions'].get('pipelinerunstatus')
28-
self._url = kwargs['extensions'].get('pipelinerunurl')
29-
self._errors = kwargs['extensions'].get('pipelinerunerrors')
30-
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), data=self._data)
12+
self._event_type = pipelinerun_type
13+
self._id = id
14+
self._name = name
15+
self._status = status
16+
self._url = url
17+
self._errors = errors
18+
super().__init__(event_type=self._event_type.value, extensions=self.create_extensions(), attrs=attrs, data=data)
3119

3220
def create_extensions(self) -> dict:
3321
"""Create extensions.
@@ -43,27 +31,27 @@ def create_extensions(self) -> dict:
4331

4432
class PipelinerunStartedEvent(PipelinerunEvent):
4533

46-
def __init__(self, **kwargs):
34+
def __init__(self, id: str=None, name: str=None, status: str=None, url: str=None, errors: str=None, attrs=None, data: dict = {}):
4735
"""Initializes class.
4836
"""
4937
self._event_type: str = EventType.PipelineRunStartedEventV1
5038

51-
super().__init__(pipelinerun_type=self._event_type, **kwargs)
52-
39+
super().__init__(pipelinerun_type=self._event_type, id=id, name=name, status=status, url=url, errors=errors, attrs=attrs, data=data)
40+
5341
class PipelinerunFinishedEvent(PipelinerunEvent):
5442

55-
def __init__(self, **kwargs):
43+
def __init__(self, id: str=None, name: str=None, status: str=None, url: str=None, errors: str=None, attrs=None, data: dict = {}):
5644
"""Initializes class.
5745
"""
5846
self._event_type: str = EventType.PipelineRunFinishedEventV1
5947

60-
super().__init__(pipelinerun_type=self._event_type, **kwargs)
48+
super().__init__(pipelinerun_type=self._event_type, id=id, name=name, status=status, url=url, errors=errors, attrs=attrs, data=data)
6149

6250
class PipelinerunQueuedEvent(PipelinerunEvent):
6351

64-
def __init__(self, **kwargs):
52+
def __init__(self, id: str=None, name: str=None, status: str=None, url: str=None, errors: str=None, attrs=None, data: dict = {}):
6553
"""Initializes class.
6654
"""
6755
self._event_type: str = EventType.PipelineRunQueuedEventV1
6856

69-
super().__init__(pipelinerun_type=self._event_type, **kwargs)
57+
super().__init__(pipelinerun_type=self._event_type, id=id, name=name, status=status, url=url, errors=errors, attrs=attrs, data=data)

0 commit comments

Comments
 (0)