Skip to content

Commit 0475026

Browse files
rbeker-BMCrbeker-BMC
authored
Merge pull request #38 from controlm/Integrations-Factory-up-to-July
Control-M Integrations Factory up to July 5th
2 parents c363ee3 + 2409c7a commit 0475026

File tree

5 files changed

+42
-41
lines changed

5 files changed

+42
-41
lines changed

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
name="ctm-python-client",
99
packages=find_packages(where="src"),
1010
package_dir={"": "src"},
11-
version="2.1.3",
11+
version="2.1.4",
1212
description="Python Workflows for Control-M",
1313
long_description=long_description,
1414
long_description_content_type='text/markdown',

‎src/aapi/integration_factory/connection_profiles.py‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -74,24 +74,24 @@ class ConnectionProfileAzureBackup(ConnectionProfile):
7474
class ConnectionProfileAwsECS(ConnectionProfile):
7575

7676
_type: str = attrs.field(init=False, default='ConnectionProfile:AWS ECS', metadata={
77-
'_aapi_repr_': 'Type', '_type_aapi_': 'ConnectionProfile:AWS ECS'})
77+
'_aapi_repr_': 'Type', '_type_aapi_': 'ConnectionProfile:AWS ECS'})
7878
object_name: str = attrs.field(metadata={'_aapi_name_': True})
7979
aws_ecs_url: str = attrs.field(kw_only=True, default=None, metadata={
8080
'_aapi_repr_': 'AWS ECS URL'})
8181
cloud_watch_url: str = attrs.field(kw_only=True, default=None, metadata={
8282
'_aapi_repr_': 'Cloud Watch URL'})
8383
aws_region: str = attrs.field(kw_only=True, default=None, metadata={
84-
'_aapi_repr_': 'AWS Region'})
84+
'_aapi_repr_': 'AWS Region'})
8585
authentication_method: str = attrs.field(kw_only=True, default=None, metadata={
86-
'_aapi_repr_': 'Authentication Method'})
86+
'_aapi_repr_': 'Authentication Method'})
8787
aws_access_key: str = attrs.field(kw_only=True, default=None, metadata={
88-
'_aapi_repr_': 'AWS Access Key'})
88+
'_aapi_repr_': 'AWS Access Key'})
8989
aws_secret: str = attrs.field(kw_only=True, default=None, metadata={
90-
'_aapi_repr_': 'AWS Secret'})
90+
'_aapi_repr_': 'AWS Secret'})
9191
aws_iam_role: str = attrs.field(kw_only=True, default=None, metadata={
9292
'_aapi_repr_': 'AWS IAM Role'})
9393
connection_timeout: str = attrs.field(kw_only=True, default=None, metadata={
94-
'_aapi_repr_': 'Connection Timeout'})
94+
'_aapi_repr_': 'Connection Timeout'})
9595

9696

9797
@attrs.define
@@ -421,15 +421,15 @@ class ConnectionProfileGCPBigQuery(ConnectionProfile):
421421
@attrs.define
422422
class ConnectionProfileGCPDataFlow(ConnectionProfile):
423423

424-
_type: str = attrs.field(init=False, default='ConnectionProfile:GCP DataFlow', metadata={
425-
'_aapi_repr_': 'Type', '_type_aapi_': 'ConnectionProfile:GCP DataFlow'})
424+
_type: str = attrs.field(init=False, default='ConnectionProfile:GCP Dataflow', metadata={
425+
'_aapi_repr_': 'Type', '_type_aapi_': 'ConnectionProfile:GCP Dataflow'})
426426
object_name: str = attrs.field(metadata={'_aapi_name_': True})
427427
identity_type: str = attrs.field(kw_only=True, default=None, metadata={
428-
'_aapi_repr_': 'Identity Type'})
428+
'_aapi_repr_': 'Identity Type'})
429429
data_flow_url: str = attrs.field(kw_only=True, default=None, metadata={
430430
'_aapi_repr_': 'DataFlow URL'})
431431
service_account_key: str = attrs.field(kw_only=True, default=None, metadata={
432-
'_aapi_repr_': 'Service Account Key'})
432+
'_aapi_repr_': 'Service Account Key'})
433433

434434

435435
@attrs.define

‎src/aapi/integration_factory/jobs.py‎

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -62,38 +62,38 @@ class JobAwsBatch(Job):
6262
class JobAzureBackup(Job):
6363

6464
_type: str = attrs.field(init=False, default='Job:Azure Backup', metadata={
65-
'_aapi_repr_': 'Type', '_type_aapi_': 'Job:Azure Backup'})
65+
'_aapi_repr_': 'Type', '_type_aapi_': 'Job:Azure Backup'})
6666
object_name: str = attrs.field(metadata={'_aapi_name_': True})
6767
connection_profile: str = attrs.field(kw_only=True, default=None, metadata={
68-
'_aapi_repr_': 'ConnectionProfile'})
68+
'_aapi_repr_': 'ConnectionProfile'})
6969
action: str = attrs.field(kw_only=True, default=None, metadata={
70-
'_aapi_repr_': 'Action'})
70+
'_aapi_repr_': 'Action'})
7171
vault_resource_group: str = attrs.field(kw_only=True, default=None, metadata={
72-
'_aapi_repr_': 'Vault Resource Group'})
72+
'_aapi_repr_': 'Vault Resource Group'})
7373
vault_name: str = attrs.field(kw_only=True, default=None, metadata={
74-
'_aapi_repr_': 'Vault Name'})
75-
v_m_resource_group: str = attrs.field(kw_only=True, default=None, metadata={
76-
'_aapi_repr_': 'VM Resource Group'})
77-
v_m_name: str = attrs.field(kw_only=True, default=None, metadata={
78-
'_aapi_repr_': 'VM Name'})
74+
'_aapi_repr_': 'Vault Name'})
75+
vm_resource_group: str = attrs.field(kw_only=True, default=None, metadata={
76+
'_aapi_repr_': 'VM Resource Group'})
77+
vm_name: str = attrs.field(kw_only=True, default=None, metadata={
78+
'_aapi_repr_': 'VM Name'})
7979
policy_name: str = attrs.field(kw_only=True, default=None, metadata={
80-
'_aapi_repr_': 'Policy Name'})
80+
'_aapi_repr_': 'Policy Name'})
8181
include_or_exclude_disks: str = attrs.field(kw_only=True, default=None, metadata={
82-
'_aapi_repr_': 'Include or Exclude Disks'})
82+
'_aapi_repr_': 'Include Or Exclude Disks'})
8383
disk_list: str = attrs.field(kw_only=True, default=None, metadata={
84-
'_abstract_aapi_container_': True})
84+
'_abstract_aapi_container_': True})
8585
restore_to_latest_recovery_point: str = attrs.field(kw_only=True, default=None, metadata={
86-
'_aapi_repr_': 'Restore to Latest Recovery Point'})
86+
'_aapi_repr_': 'Restore to Latest Recovery Point'})
8787
recovery_point_name: str = attrs.field(kw_only=True, default=None, metadata={
88-
'_aapi_repr_': 'Recovery Point Name'})
88+
'_aapi_repr_': 'Recovery Point Name'})
8989
storage_account_name: str = attrs.field(kw_only=True, default=None, metadata={
90-
'_aapi_repr_': 'Storage Account Name'})
90+
'_aapi_repr_': 'Storage Account Name'})
9191
restore_region: str = attrs.field(kw_only=True, default=None, metadata={
92-
'_aapi_repr_': 'Restore Region'})
92+
'_aapi_repr_': 'Restore Region'})
9393
status_polling_frequency: str = attrs.field(kw_only=True, default=None, metadata={
94-
'_aapi_repr_': 'Status Polling Frequency'})
94+
'_aapi_repr_': 'Status Polling Frequency'})
9595
failure_tolerance_: str = attrs.field(kw_only=True, default=None, metadata={
96-
'_aapi_repr_': 'Failure Tolerance '})
96+
'_aapi_repr_': 'Failure Tolerance '})
9797

9898

9999
@attrs.define
@@ -561,25 +561,25 @@ class JobGCPBigQuery(Job):
561561
@attrs.define
562562
class JobGCPDataFlow(Job):
563563

564-
_type: str = attrs.field(init=False, default='Job:GCP DataFlow', metadata={
565-
'_aapi_repr_': 'Type', '_type_aapi_': 'Job:GCP DataFlow'})
564+
_type: str = attrs.field(init=False, default='Job:GCP Dataflow', metadata={
565+
'_aapi_repr_': 'Type', '_type_aapi_': 'Job:GCP Dataflow'})
566566
object_name: str = attrs.field(metadata={'_aapi_name_': True})
567567
connection_profile: str = attrs.field(kw_only=True, default=None, metadata={
568-
'_aapi_repr_': 'ConnectionProfile'})
568+
'_aapi_repr_': 'ConnectionProfile'})
569569
project_id: str = attrs.field(kw_only=True, default=None, metadata={
570-
'_aapi_repr_': 'Project ID'})
570+
'_aapi_repr_': 'Project ID'})
571571
region: str = attrs.field(kw_only=True, default=None, metadata={
572-
'_aapi_repr_': 'Region'})
572+
'_aapi_repr_': 'Region'})
573573
template_type: str = attrs.field(kw_only=True, default=None, metadata={
574-
'_aapi_repr_': 'Template Type'})
574+
'_aapi_repr_': 'Template Type'})
575575
template_location_gs_: str = attrs.field(kw_only=True, default=None, metadata={
576-
'_aapi_repr_': 'Template Location (gs://)'})
576+
'_aapi_repr_': 'Template Location (gs://)'})
577577
parameters__json_format: str = attrs.field(kw_only=True, default=None, metadata={
578-
'_aapi_repr_': 'Parameters (JSON Format)'})
578+
'_aapi_repr_': 'Parameters (JSON Format)'})
579579
verification_poll_interval_in_seconds: str = attrs.field(kw_only=True, default=None, metadata={
580-
'_aapi_repr_': 'Verification Poll Interval (in seconds)'})
580+
'_aapi_repr_': 'Verification Poll Interval (in seconds)'})
581581
log_level: str = attrs.field(kw_only=True, default=None, metadata={
582-
'_aapi_repr_': 'Log Level'})
582+
'_aapi_repr_': 'Log Level'})
583583

584584

585585
@attrs.define
@@ -1163,6 +1163,7 @@ class JobAwsAthena(Job):
11631163
no_perm: str = attrs.field(kw_only=True, default=None, metadata={
11641164
'_aapi_repr_': 'NoPerm'})
11651165

1166+
11661167
@attrs.define
11671168
class JobGCPDataprep(Job):
11681169

‎src/ctm_python_client/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
__version__ = '2.1.3'
1+
__version__ = '2.1.4'
22
__author__ = 'BMC Software'

‎tests/test_sanity.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ def test_version_author():
22
import ctm_python_client
33

44
assert ctm_python_client.__author__ == 'BMC Software'
5-
assert ctm_python_client.__version__ == '2.1.3'
5+
assert ctm_python_client.__version__ == '2.1.4'
66

77

0 commit comments

Comments
 (0)