Skip to content

Commit ae74e81

Browse files
allmightyspiffallmightyspiff
committedFeb 14, 2025··
#2211 fixed testing issues
1 parent 7fa769a commit ae74e81

File tree

8 files changed

+38
-265
lines changed

8 files changed

+38
-265
lines changed
 

‎.secrets.baseline

+14-14
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-10-07T21:05:06Z",
6+
"generated_at": "2025-02-14T20:05:29Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -574,7 +574,7 @@
574574
"hashed_secret": "a4c805a62a0387010cd172cfed6f6772eb92a5d6",
575575
"is_secret": false,
576576
"is_verified": false,
577-
"line_number": 32,
577+
"line_number": 31,
578578
"type": "Secret Keyword",
579579
"verified_result": null
580580
}
@@ -584,7 +584,7 @@
584584
"hashed_secret": "f7a9e24777ec23212c54d7a350bc5bea5477fdbb",
585585
"is_secret": false,
586586
"is_verified": false,
587-
"line_number": 1088,
587+
"line_number": 1077,
588588
"type": "Secret Keyword",
589589
"verified_result": null
590590
}
@@ -604,15 +604,15 @@
604604
"hashed_secret": "8de91b1f4c8ca32302ae101da16fb88fb127582a",
605605
"is_secret": false,
606606
"is_verified": false,
607-
"line_number": 165,
607+
"line_number": 168,
608608
"type": "Secret Keyword",
609609
"verified_result": null
610610
},
611611
{
612612
"hashed_secret": "2da422d13be8072a8dcae1e46b36add9cb2372fa",
613613
"is_secret": false,
614614
"is_verified": false,
615-
"line_number": 190,
615+
"line_number": 193,
616616
"type": "Secret Keyword",
617617
"verified_result": null
618618
}
@@ -640,39 +640,39 @@
640640
"hashed_secret": "2c0ceacd445f15ebc02315e18fb3ed8ec73a61a0",
641641
"is_secret": false,
642642
"is_verified": false,
643-
"line_number": 544,
643+
"line_number": 545,
644644
"type": "Hex High Entropy String",
645645
"verified_result": null
646646
},
647647
{
648648
"hashed_secret": "f08bf4f915242a2700e861e4e073ab45dc745e92",
649649
"is_secret": false,
650650
"is_verified": false,
651-
"line_number": 551,
651+
"line_number": 552,
652652
"type": "Hex High Entropy String",
653653
"verified_result": null
654654
},
655655
{
656656
"hashed_secret": "806f21b4bc195ffd5749f295b83909d66a56ff38",
657657
"is_secret": false,
658658
"is_verified": false,
659-
"line_number": 583,
659+
"line_number": 584,
660660
"type": "Hex High Entropy String",
661661
"verified_result": null
662662
},
663663
{
664664
"hashed_secret": "1c89f7ca3440fe5db16e3b0ffe414d11845331d9",
665665
"is_secret": false,
666666
"is_verified": false,
667-
"line_number": 589,
667+
"line_number": 590,
668668
"type": "Hex High Entropy String",
669669
"verified_result": null
670670
},
671671
{
672672
"hashed_secret": "bc553d847e40dd6f3f63638f16f57b28ce1425cc",
673673
"is_secret": false,
674674
"is_verified": false,
675-
"line_number": 596,
675+
"line_number": 597,
676676
"type": "Hex High Entropy String",
677677
"verified_result": null
678678
}
@@ -700,7 +700,7 @@
700700
"hashed_secret": "8af1f8146d96a3cd862281442d0d6c5cb6f8f9e5",
701701
"is_secret": false,
702702
"is_verified": false,
703-
"line_number": 176,
703+
"line_number": 181,
704704
"type": "Hex High Entropy String",
705705
"verified_result": null
706706
}
@@ -720,7 +720,7 @@
720720
"hashed_secret": "9878e362285eb314cfdbaa8ee8c300c285856810",
721721
"is_secret": false,
722722
"is_verified": false,
723-
"line_number": 324,
723+
"line_number": 313,
724724
"type": "Secret Keyword",
725725
"verified_result": null
726726
}
@@ -748,15 +748,15 @@
748748
"hashed_secret": "f08c5dc4980df3c1237e88b872a2429dac6be328",
749749
"is_secret": false,
750750
"is_verified": false,
751-
"line_number": 310,
751+
"line_number": 297,
752752
"type": "Secret Keyword",
753753
"verified_result": null
754754
},
755755
{
756756
"hashed_secret": "7e6a3680012346b94b54731e13d8a9ffa3790645",
757757
"is_secret": false,
758758
"is_verified": false,
759-
"line_number": 396,
759+
"line_number": 383,
760760
"type": "Secret Keyword",
761761
"verified_result": null
762762
}

‎SoftLayer/CLI/cdn/cdn.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44
import click
55

66
import SoftLayer
7-
from SoftLayer.CLI import environment
8-
from SoftLayer.CLI import exceptions
9-
from SoftLayer.CLI import formatting
107

118

129
@click.command(cls=SoftLayer.CLI.command.SLCommand, deprecated=True)
13-
@environment.pass_env
14-
def cli(env):
10+
def cli():
1511
"""https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation"""
16-
pass

‎SoftLayer/managers/__init__.py

-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
from SoftLayer.managers.account import AccountManager
1111
from SoftLayer.managers.bandwidth import BandwidthManager
1212
from SoftLayer.managers.block import BlockStorageManager
13-
from SoftLayer.managers.cdn import CDNManager
1413
from SoftLayer.managers.dedicated_host import DedicatedHostManager
1514
from SoftLayer.managers.dns import DNSManager
1615
from SoftLayer.managers.event_log import EventLogManager
@@ -40,7 +39,6 @@
4039
'BandwidthManager',
4140
'BlockStorageManager',
4241
'CapacityManager',
43-
'CDNManager',
4442
'DedicatedHostManager',
4543
'DNSManager',
4644
'EventLogManager',

‎docs/cli/cdn.rst

+23-14
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,47 @@ Interacting with CDN
44
=====================
55

66

7-
.. click:: SoftLayer.CLI.cdn.detail:cli
7+
.. click:: SoftLayer.CLI.cdn.cdn:cli
8+
:prog: cdn list
9+
:show-nested:
10+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
11+
12+
.. click:: SoftLayer.CLI.cdn.cdn:cli
813
:prog: cdn detail
914
:show-nested:
15+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
1016

11-
.. click:: SoftLayer.CLI.cdn.list:cli
12-
:prog: cdn list
17+
.. click:: SoftLayer.CLI.cdn.cdn:cli
18+
:prog: cdn edit
1319
:show-nested:
20+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
1421

15-
.. click:: SoftLayer.CLI.cdn.origin_add:cli
22+
.. click:: SoftLayer.CLI.cdn.cdn:cli
1623
:prog: cdn origin-add
1724
:show-nested:
25+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
1826

19-
.. click:: SoftLayer.CLI.cdn.origin_list:cli
27+
.. click:: SoftLayer.CLI.cdn.cdn:cli
2028
:prog: cdn origin-list
2129
:show-nested:
30+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
2231

23-
.. click:: SoftLayer.CLI.cdn.origin_remove:cli
32+
.. click:: SoftLayer.CLI.cdn.cdn:cli
2433
:prog: cdn origin-remove
2534
:show-nested:
35+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
2636

27-
.. click:: SoftLayer.CLI.cdn.purge:cli
37+
.. click:: SoftLayer.CLI.cdn.cdn:cli
2838
:prog: cdn purge
2939
:show-nested:
40+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
3041

31-
.. click:: SoftLayer.CLI.cdn.edit:cli
32-
:prog: cdn edit
33-
:show-nested:
34-
35-
.. click:: SoftLayer.CLI.cdn.delete:cli
42+
.. click:: SoftLayer.CLI.cdn.cdn:cli
3643
:prog: cdn delete
3744
:show-nested:
45+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation
3846

39-
.. click:: SoftLayer.CLI.cdn.create:cli
47+
.. click:: SoftLayer.CLI.cdn.cdn:cli
4048
:prog: cdn create
41-
:show-nested:
49+
:show-nested:
50+
DEPRECATED https://cloud.ibm.com/docs/CDN?topic=CDN-cdn-deprecation

‎tests/functional_tests.py

-18
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import SoftLayer
1010
from SoftLayer import testing
11-
from SoftLayer import transports
1211

1312

1413
class FunctionalTest(testing.TestCase):
@@ -34,23 +33,6 @@ def test_failed_auth(self):
3433
SoftLayer.SoftLayerAPIError,
3534
client['SoftLayer_User_Customer'].getPortalLoginToken)
3635

37-
def test_no_hostname(self):
38-
try:
39-
request = transports.Request()
40-
request.service = 'SoftLayer_Account'
41-
request.method = 'getObject'
42-
request.id = 1234
43-
44-
# This test will fail if 'notvalidsoftlayer.com' becomes a thing
45-
transport = transports.XmlRpcTransport(
46-
endpoint_url='http://notvalidsoftlayer.com',
47-
)
48-
transport(request)
49-
except SoftLayer.TransportError as ex:
50-
self.assertEqual(ex.faultCode, 0)
51-
else:
52-
self.fail('Transport Error Exception Not Raised')
53-
5436

5537
class AuthedUser(FunctionalTest):
5638
def test_service_does_not_exist(self):

0 commit comments

Comments
 (0)
Please sign in to comment.