Skip to content

Commit

Permalink
Merge pull request #659 from softlayer/20240426
Browse files Browse the repository at this point in the history
20240426 release
  • Loading branch information
allmightyspiff authored Apr 26, 2024
2 parents 9b074ef + ab0b27d commit 8b49746
Show file tree
Hide file tree
Showing 11 changed files with 173 additions and 123 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ repos:
# when "--baseline" without "--use-all-plugins", pre-commit scan with just plugins in baseline file
# when "--baseline" with "--use-all-plugins", pre-commit scan with all available plugins
# add "--fail-on-unaudited" to fail pre-commit for unaudited potential secrets
args: [--baseline, .secrets.baseline, --use-all-plugins]
args: [--baseline, .secrets.baseline, --use-all-plugins]
92 changes: 2 additions & 90 deletions .secrets.baseline
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"exclude": {
"files": "^.secrets.baseline$",
"files": "data/sldn_metadata.json|content/reference/*|static/*|^.secrets.baseline$",
"lines": null
},
"generated_at": "2024-04-19T21:12:09Z",
"generated_at": "2024-04-26T17:39:37Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -3375,16 +3375,6 @@
"verified_result": null
}
],
"content/php/OrderStaticPublicIPv6.php.md": [
{
"hashed_secret": "43079b01ab134e8a467bb6f8caeaf1847dd6fe36",
"is_secret": false,
"is_verified": false,
"line_number": 35,
"type": "Secret Keyword",
"verified_result": null
}
],
"content/php/PaymentMethod.php.md": [
{
"hashed_secret": "591c10157b8966c9777e91961c621b725de67759",
Expand Down Expand Up @@ -9381,16 +9371,6 @@
"verified_result": null
}
],
"data/sldn_metadata.json": [
{
"hashed_secret": "6307c8f2b12de9d08739f3904bbc85b7d163bed7",
"is_secret": false,
"is_verified": false,
"line_number": 200155,
"type": "Base64 High Entropy String",
"verified_result": null
}
],
"sldnHtml/list.html": [
{
"hashed_secret": "57123dd83e8afc2b11d970252ff3f63717894d91",
Expand Down Expand Up @@ -9448,74 +9428,6 @@
"type": "Base64 High Entropy String",
"verified_result": null
}
],
"static/apiVideo01-Basics.md.html": [
{
"hashed_secret": "4ff447b8ef42ca51fa6fb287bed8d40f49be58f1",
"is_secret": false,
"is_verified": false,
"line_number": 212,
"type": "Secret Keyword",
"verified_result": null
}
],
"static/fontawesome/css/all.css": [
{
"hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
"is_secret": false,
"is_verified": false,
"line_number": 4239,
"type": "Secret Keyword",
"verified_result": null
}
],
"static/fontawesome/less/_icons.less": [
{
"hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
"is_secret": false,
"is_verified": false,
"line_number": 1353,
"type": "Secret Keyword",
"verified_result": null
}
],
"static/fontawesome/less/_variables.less": [
{
"hashed_secret": "06d03a73cdc6ffa2db6ba134bd15b6756e9f2c7d",
"is_secret": false,
"is_verified": false,
"line_number": 340,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "6f613592cdfc34fe6ee7b16cbc47ddee53c781c5",
"is_secret": false,
"is_verified": false,
"line_number": 1365,
"type": "Secret Keyword",
"verified_result": null
}
],
"static/fontawesome/scss/_icons.scss": [
{
"hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
"is_secret": false,
"is_verified": false,
"line_number": 1353,
"type": "Secret Keyword",
"verified_result": null
}
],
"static/fontawesome/scss/_variables.scss": [
{
"hashed_secret": "14cfc358684acb626583f8535f761f30bd3f488a",
"is_secret": false,
"is_verified": false,
"line_number": 1370,
"type": "Secret Keyword",
"verified_result": null
}
]
},
"version": "0.13.1+ibm.62.dss",
Expand Down
8 changes: 6 additions & 2 deletions bin/releaseNotes.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ def __init__(self, apitoken, debug=False):
self.releases = []
self.internal = re.compile(r"internal", re.I)
self.debug = debug
self.verify = '/etc/ssl/certs/allCAbundle.pem'
# self.verify = True

def getReleaseJiras(self, days=7):
jql_project = """project = JIRA"""
Expand All @@ -34,14 +36,14 @@ def getReleaseJiras(self, days=7):
jql = f"{jql_project} AND {jql_type} AND {jql_start} AND {jql_status} {jql_orderby}"
apirequest = f"{self.jira_url}/search?jql={jql}"
self.printDebug(f"Calling {apirequest}")
result = requests.get(apirequest, headers=self.headers, verify=True)
result = requests.get(apirequest, headers=self.headers, verify=self.verify)
# sleep a bit so we don't get rate limited
time.sleep(0.2)
return self.jiraToJson(result)

def getNotes(self, jira_issue):
self.printDebug(f"Getting JIRA: {jira_issue}")
result = requests.get(jira_issue, headers=self.headers, verify=True)
result = requests.get(jira_issue, headers=self.headers, verify=self.verify)
json = self.jiraToJson(result)
return json.get('fields', {}).get('customfield_10113', 'NONE')

Expand Down Expand Up @@ -148,6 +150,8 @@ def cli(debug, days):
"""CLI entrypoint"""

apitoken = os.getenv('SL_JIRA_TOKEN')
# I'm not sure why this has to be set along with verify, but it works this way.
os.environ['SSL_CERT_FILE'] = '/etc/ssl/certs/allCAbundle.pem'
if not apitoken:
raise click.UsageError("APITOKEN env variable is not set")

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "getHealth"
description: "A backbone's status."
description: "[Deprecated] A backbone's status."
date: "2018-02-12"
tags:
- "method"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "getLocation"
description: "Which of the SoftLayer datacenters a backbone is connected to."
description: "[Deprecated] Which of the SoftLayer datacenters a backbone is connected to."
date: "2018-02-12"
tags:
- "method"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
title: "getNetworkComponent"
description: "A backbone's primary network component."
description: "[Deprecated] A backbone's primary network component."
date: "2018-02-12"
tags:
- "method"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
title: "createObject"
description: "Create a new hardware member on the gateway. This also asynchronously sets up the network for this member. Progress of this process can be monitored via the gateway status. All members created with this object must have no VLANs attached. "
date: "2018-02-12"
tags:
- "method"
- "sldn"
- "Network"
classes:
- "SoftLayer_Network_Gateway_Member"
type: "reference"
layout: "method"
mainService : "SoftLayer_Network_Gateway_Member"
---

### [REST Example](#createObject-example) <a href="/article/rest/"><i class="fas fa-question"></i></a> {#createObject-example .anchor-link}
```bash
curl -g -u $SL_USER:$SL_APIKEY -X POST -d '{"parameters": [SoftLayer_Network_Gateway_Member]}' \
'https://api.softlayer.com/rest/v3.1/SoftLayer_Network_Gateway_Member/createObject'
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
title: "createObjects"
description: "Create multiple new hardware members on the gateway. This also asynchronously sets up the network for the members. Progress of this process can be monitored via the gateway status. All members created with this object must have no VLANs attached. "
date: "2018-02-12"
tags:
- "method"
- "sldn"
- "Network"
classes:
- "SoftLayer_Network_Gateway_Member"
type: "reference"
layout: "method"
mainService : "SoftLayer_Network_Gateway_Member"
---

### [REST Example](#createObjects-example) <a href="/article/rest/"><i class="fas fa-question"></i></a> {#createObjects-example .anchor-link}
```bash
curl -g -u $SL_USER:$SL_APIKEY -X POST -d '{"parameters": [SoftLayer_Network_Gateway_Member]}' \
'https://api.softlayer.com/rest/v3.1/SoftLayer_Network_Gateway_Member/createObjects'
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
title: "editObject"
description: "Edit this member, only manufacturer and version can be changed "
date: "2018-02-12"
tags:
- "method"
- "sldn"
- "Network"
classes:
- "SoftLayer_Network_Gateway_Member"
type: "reference"
layout: "method"
mainService : "SoftLayer_Network_Gateway_Member"
---

### [REST Example](#editObject-example) <a href="/article/rest/"><i class="fas fa-question"></i></a> {#editObject-example .anchor-link}
```bash
curl -g -u $SL_USER:$SL_APIKEY -X POST -d '{"parameters": [SoftLayer_Network_Gateway_Member]}' \
'https://api.softlayer.com/rest/v3.1/SoftLayer_Network_Gateway_Member/{SoftLayer_Network_Gateway_MemberID}/editObject'
```
12 changes: 12 additions & 0 deletions content/release_notes/2024/20240426.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
title: "Release notes: April 26, 2024"
date: "2024-04-26"
tags:
- "release notes"
---

#### API

- Fixed a bug where compute resources added to a pool would enter a state where they could not be added or removed from any pool. Restore the state of allotment details if an SLDN call fails to add allocations after ejecting them NETWORK-14419
- Announce deprecation of Network Backbone. Add deprecation tags and monitorUsage to Network Backbone references NETWORK-14415

Loading

0 comments on commit 8b49746

Please sign in to comment.