Skip to content

Commit 121b449

Browse files
authored
Merge pull request #64 from watson-developer-cloud/6599-refactor-bluemix
Refactor bluemix to cloud.ibm
2 parents 1a8912d + e375714 commit 121b449

16 files changed

+97
-97
lines changed

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ assignees: ''
1010
**Service Status**
1111
Please review the following:
1212

13-
- If the bug is because of the service issue, and service is throwing 5xx error, please go to https://console.bluemix.net/status?tags=platform,runtimes,services&view=n:i and check the status of the service.
14-
- If it's not a service issue, please continue with a bug report.
13+
- For service issues or 5xx errors, first, go to the [IBM Cloud status page](https://cloud.ibm.com/status?component=compare-comply%2Cdiscovery%2Cconversation%2Cwatson-vision-combined%2Cnatural-language-understanding%2Cnatural-language-classifier%2Clanguage-translator%2Cpersonality-insights%2Cspeech-to-text%2Ctext-to-speech%2Ctone-analyzer&selected=status) and check the status of the service.
14+
- If the service status is OK, continue with a bug report.
1515

1616
**Describe the bug**
1717
A clear and concise description of what the bug is.

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ IBM Cloud is migrating to token-based Identity and Access Management (IAM) authe
124124
You supply either an IAM service **API key** or an **access token**:
125125

126126
- Use the API key to have the SDK manage the lifecycle of the access token. The SDK requests an access token, ensures that the access token is valid, and refreshes it if necessary.
127-
- Use the access token if you want to manage the lifecycle yourself. For details, see [Authenticating with IAM tokens](https://console.bluemix.net/docs/services/watson/getting-started-iam.html).
127+
- Use the access token if you want to manage the lifecycle yourself. For details, see [Authenticating with IAM tokens](https://cloud.ibm.com/docs/services/watson?topic=watson-iam).
128128

129129
#### Supplying the IAM API key
130130

@@ -133,7 +133,7 @@ You supply either an IAM service **API key** or an **access token**:
133133
discovery = IBMWatson::DiscoveryV1.new(
134134
version: "2017-10-16",
135135
iam_apikey: "<iam_apikey>",
136-
iam_url: "<iam_url>" # optional - the default value is https://iam.ng.bluemix.net/identity/token
136+
iam_url: "<iam_url>" # optional - the default value is https://iam.cloud.ibm.com/identity/token
137137
)
138138
```
139139

@@ -364,11 +364,11 @@ Here are some projects that have been using the SDK:
364364
We'd love to highlight cool open-source projects that use this SDK! If you'd like to get your project added to the list, feel free to make an issue linking us to it.
365365

366366
[wdc]: http://www.ibm.com/watson/developercloud/
367-
[ibm_cloud]: https://console.bluemix.net
368-
[watson-dashboard]: https://console.bluemix.net/dashboard/apps?category=ai
367+
[ibm_cloud]: https://cloud.ibm.com/
368+
[watson-dashboard]: https://cloud.ibm.com/catalog?category=ai
369369
[examples]: https://github.com/watson-developer-cloud/ruby-sdk/tree/master/examples
370370
[CONTRIBUTING]: https://github.com/watson-developer-cloud/ruby-sdk/blob/master/CONTRIBUTING.md
371371
[license]: http://www.apache.org/licenses/LICENSE-2.0
372-
[vcap_services]: https://console.bluemix.net/docs/services/watson/getting-started-variables.html
373-
[ibm-cloud-onboarding]: http://console.bluemix.net/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Ruby
372+
[vcap_services]: https://cloud.ibm.com/docs/services/watson?topic=watson-vcapServices
373+
[ibm-cloud-onboarding]: http://cloud.ibm.com/registration?target=/developer/watson&cm_sp=WatsonPlatform-WatsonServices-_-OnPageNavLink-IBMWatson_SDKs-_-Ruby
374374
[ivar]: http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/IVar.html

ibm_watson.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
1919
if spec.respond_to?(:metadata)
2020
spec.metadata["allowed_push_host"] = "https://rubygems.org"
2121
spec.metadata["source_code_uri"] = "https://github.com/watson-developer-cloud/ruby-sdk"
22-
spec.metadata["documentation_uri"] = "https://console.bluemix.net/developer/watson/documentation"
22+
spec.metadata["documentation_uri"] = "https://cloud.ibm.com/developer/watson/documentation"
2323
else
2424
raise "RubyGems 2.0 or newer is required to protect against " \
2525
"public gem pushes."
@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
3636
spec.add_runtime_dependency "eventmachine", "~> 1.2"
3737
spec.add_runtime_dependency "faye-websocket", "~> 0.10"
3838
spec.add_runtime_dependency "http", "~> 4.1.0"
39-
spec.add_runtime_dependency "ibm_cloud_sdk_core", "~> 0.1.1"
39+
spec.add_runtime_dependency "ibm_cloud_sdk_core", "~> 0.2.0"
4040

4141
spec.add_development_dependency "bundler", "~> 1.16"
4242
spec.add_development_dependency "codecov", "~> 0.1"

lib/ibm_watson/assistant_v1.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ class AssistantV1 < IBMCloudSdkCore::BaseService
4747
# ready for a later version.
4848
# @option args url [String] The base url to use when contacting the service (e.g.
4949
# "https://gateway.watsonplatform.net/assistant/api").
50-
# The base url may differ between Bluemix regions.
50+
# The base url may differ between IBM Cloud regions.
5151
# @option args username [String] The username used to authenticate with the service.
5252
# Username and password credentials are only required to run your
53-
# application locally or outside of Bluemix. When running on
54-
# Bluemix, the credentials will be automatically loaded from the
53+
# application locally or outside of IBM Cloud. When running on
54+
# IBM Cloud, the credentials will be automatically loaded from the
5555
# `VCAP_SERVICES` environment variable.
5656
# @option args password [String] The password used to authenticate with the service.
5757
# Username and password credentials are only required to run your
58-
# application locally or outside of Bluemix. When running on
59-
# Bluemix, the credentials will be automatically loaded from the
58+
# application locally or outside of IBM Cloud. When running on
59+
# IBM Cloud, the credentials will be automatically loaded from the
6060
# `VCAP_SERVICES` environment variable.
6161
# @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
6262
# this API key is provided, the SDK will manage the token and handle the
@@ -66,7 +66,7 @@ class AssistantV1 < IBMCloudSdkCore::BaseService
6666
# it expires or reactively upon receiving a 401 from the service as any requests
6767
# made with an expired token will fail.
6868
# @option args iam_url [String] An optional URL for the IAM service API. Defaults to
69-
# 'https://iam.ng.bluemix.net/identity/token'.
69+
# 'https://iam.cloud.ibm.com/identity/token'.
7070
def initialize(args = {})
7171
@__async_initialized__ = false
7272
defaults = {}

lib/ibm_watson/assistant_v2.rb

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ class AssistantV2 < IBMCloudSdkCore::BaseService
4747
# ready for a later version.
4848
# @option args url [String] The base url to use when contacting the service (e.g.
4949
# "https://gateway.watsonplatform.net/assistant/api").
50-
# The base url may differ between Bluemix regions.
50+
# The base url may differ between IBM Cloud regions.
5151
# @option args username [String] The username used to authenticate with the service.
5252
# Username and password credentials are only required to run your
53-
# application locally or outside of Bluemix. When running on
54-
# Bluemix, the credentials will be automatically loaded from the
53+
# application locally or outside of IBM Cloud. When running on
54+
# IBM Cloud, the credentials will be automatically loaded from the
5555
# `VCAP_SERVICES` environment variable.
5656
# @option args password [String] The password used to authenticate with the service.
5757
# Username and password credentials are only required to run your
58-
# application locally or outside of Bluemix. When running on
59-
# Bluemix, the credentials will be automatically loaded from the
58+
# application locally or outside of IBM Cloud. When running on
59+
# IBM Cloud, the credentials will be automatically loaded from the
6060
# `VCAP_SERVICES` environment variable.
6161
# @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
6262
# this API key is provided, the SDK will manage the token and handle the
@@ -66,7 +66,7 @@ class AssistantV2 < IBMCloudSdkCore::BaseService
6666
# it expires or reactively upon receiving a 401 from the service as any requests
6767
# made with an expired token will fail.
6868
# @option args iam_url [String] An optional URL for the IAM service API. Defaults to
69-
# 'https://iam.ng.bluemix.net/identity/token'.
69+
# 'https://iam.cloud.ibm.com/identity/token'.
7070
def initialize(args = {})
7171
@__async_initialized__ = false
7272
defaults = {}
@@ -96,7 +96,7 @@ def initialize(args = {})
9696
# @param assistant_id [String] Unique identifier of the assistant. You can find the assistant ID of an assistant
9797
# on the **Assistants** tab of the Watson Assistant tool. For information about
9898
# creating assistants, see the
99-
# [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
99+
# [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-assistant-add#assistant-add-task).
100100
#
101101
# **Note:** Currently, the v2 API does not support creating assistants.
102102
# @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
@@ -131,7 +131,7 @@ def create_session(assistant_id:)
131131
# @param assistant_id [String] Unique identifier of the assistant. You can find the assistant ID of an assistant
132132
# on the **Assistants** tab of the Watson Assistant tool. For information about
133133
# creating assistants, see the
134-
# [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
134+
# [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-assistant-add#assistant-add-task).
135135
#
136136
# **Note:** Currently, the v2 API does not support creating assistants.
137137
# @param session_id [String] Unique identifier of the session.
@@ -174,7 +174,7 @@ def delete_session(assistant_id:, session_id:)
174174
# @param assistant_id [String] Unique identifier of the assistant. You can find the assistant ID of an assistant
175175
# on the **Assistants** tab of the Watson Assistant tool. For information about
176176
# creating assistants, see the
177-
# [documentation](https://console.bluemix.net/docs/services/assistant/assistant-add.html#assistant-add-task).
177+
# [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-assistant-add#assistant-add-task).
178178
#
179179
# **Note:** Currently, the v2 API does not support creating assistants.
180180
# @param session_id [String] Unique identifier of the session.

lib/ibm_watson/compare_comply_v1.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class CompareComplyV1 < IBMCloudSdkCore::BaseService
4646
# ready for a later version.
4747
# @option args url [String] The base url to use when contacting the service (e.g.
4848
# "https://gateway.watsonplatform.net/compare-comply/api").
49-
# The base url may differ between Bluemix regions.
49+
# The base url may differ between IBM Cloud regions.
5050
# @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
5151
# this API key is provided, the SDK will manage the token and handle the
5252
# refreshing.
@@ -55,7 +55,7 @@ class CompareComplyV1 < IBMCloudSdkCore::BaseService
5555
# it expires or reactively upon receiving a 401 from the service as any requests
5656
# made with an expired token will fail.
5757
# @option args iam_url [String] An optional URL for the IAM service API. Defaults to
58-
# 'https://iam.ng.bluemix.net/identity/token'.
58+
# 'https://iam.cloud.ibm.com/identity/token'.
5959
def initialize(args = {})
6060
@__async_initialized__ = false
6161
defaults = {}

lib/ibm_watson/discovery_v1.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ class DiscoveryV1 < IBMCloudSdkCore::BaseService
4949
# ready for a later version.
5050
# @option args url [String] The base url to use when contacting the service (e.g.
5151
# "https://gateway.watsonplatform.net/discovery/api").
52-
# The base url may differ between Bluemix regions.
52+
# The base url may differ between IBM Cloud regions.
5353
# @option args username [String] The username used to authenticate with the service.
5454
# Username and password credentials are only required to run your
55-
# application locally or outside of Bluemix. When running on
56-
# Bluemix, the credentials will be automatically loaded from the
55+
# application locally or outside of IBM Cloud. When running on
56+
# IBM Cloud, the credentials will be automatically loaded from the
5757
# `VCAP_SERVICES` environment variable.
5858
# @option args password [String] The password used to authenticate with the service.
5959
# Username and password credentials are only required to run your
60-
# application locally or outside of Bluemix. When running on
61-
# Bluemix, the credentials will be automatically loaded from the
60+
# application locally or outside of IBM Cloud. When running on
61+
# IBM Cloud, the credentials will be automatically loaded from the
6262
# `VCAP_SERVICES` environment variable.
6363
# @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
6464
# this API key is provided, the SDK will manage the token and handle the
@@ -68,7 +68,7 @@ class DiscoveryV1 < IBMCloudSdkCore::BaseService
6868
# it expires or reactively upon receiving a 401 from the service as any requests
6969
# made with an expired token will fail.
7070
# @option args iam_url [String] An optional URL for the IAM service API. Defaults to
71-
# 'https://iam.ng.bluemix.net/identity/token'.
71+
# 'https://iam.cloud.ibm.com/identity/token'.
7272
def initialize(args = {})
7373
@__async_initialized__ = false
7474
defaults = {}

lib/ibm_watson/language_translator_v3.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ class LanguageTranslatorV3 < IBMCloudSdkCore::BaseService
4949
# ready for a later version.
5050
# @option args url [String] The base url to use when contacting the service (e.g.
5151
# "https://gateway.watsonplatform.net/language-translator/api").
52-
# The base url may differ between Bluemix regions.
52+
# The base url may differ between IBM Cloud regions.
5353
# @option args username [String] The username used to authenticate with the service.
5454
# Username and password credentials are only required to run your
55-
# application locally or outside of Bluemix. When running on
56-
# Bluemix, the credentials will be automatically loaded from the
55+
# application locally or outside of IBM Cloud. When running on
56+
# IBM Cloud, the credentials will be automatically loaded from the
5757
# `VCAP_SERVICES` environment variable.
5858
# @option args password [String] The password used to authenticate with the service.
5959
# Username and password credentials are only required to run your
60-
# application locally or outside of Bluemix. When running on
61-
# Bluemix, the credentials will be automatically loaded from the
60+
# application locally or outside of IBM Cloud. When running on
61+
# IBM Cloud, the credentials will be automatically loaded from the
6262
# `VCAP_SERVICES` environment variable.
6363
# @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
6464
# this API key is provided, the SDK will manage the token and handle the
@@ -68,7 +68,7 @@ class LanguageTranslatorV3 < IBMCloudSdkCore::BaseService
6868
# it expires or reactively upon receiving a 401 from the service as any requests
6969
# made with an expired token will fail.
7070
# @option args iam_url [String] An optional URL for the IAM service API. Defaults to
71-
# 'https://iam.ng.bluemix.net/identity/token'.
71+
# 'https://iam.cloud.ibm.com/identity/token'.
7272
def initialize(args = {})
7373
@__async_initialized__ = false
7474
defaults = {}

lib/ibm_watson/natural_language_classifier_v1.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,16 @@ class NaturalLanguageClassifierV1 < IBMCloudSdkCore::BaseService
3838
# @param args [Hash] The args to initialize with
3939
# @option args url [String] The base url to use when contacting the service (e.g.
4040
# "https://gateway.watsonplatform.net/natural-language-classifier/api").
41-
# The base url may differ between Bluemix regions.
41+
# The base url may differ between IBM Cloud regions.
4242
# @option args username [String] The username used to authenticate with the service.
4343
# Username and password credentials are only required to run your
44-
# application locally or outside of Bluemix. When running on
45-
# Bluemix, the credentials will be automatically loaded from the
44+
# application locally or outside of IBM Cloud. When running on
45+
# IBM Cloud, the credentials will be automatically loaded from the
4646
# `VCAP_SERVICES` environment variable.
4747
# @option args password [String] The password used to authenticate with the service.
4848
# Username and password credentials are only required to run your
49-
# application locally or outside of Bluemix. When running on
50-
# Bluemix, the credentials will be automatically loaded from the
49+
# application locally or outside of IBM Cloud. When running on
50+
# IBM Cloud, the credentials will be automatically loaded from the
5151
# `VCAP_SERVICES` environment variable.
5252
# @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
5353
# this API key is provided, the SDK will manage the token and handle the
@@ -57,7 +57,7 @@ class NaturalLanguageClassifierV1 < IBMCloudSdkCore::BaseService
5757
# it expires or reactively upon receiving a 401 from the service as any requests
5858
# made with an expired token will fail.
5959
# @option args iam_url [String] An optional URL for the IAM service API. Defaults to
60-
# 'https://iam.ng.bluemix.net/identity/token'.
60+
# 'https://iam.cloud.ibm.com/identity/token'.
6161
def initialize(args = {})
6262
@__async_initialized__ = false
6363
defaults = {}

0 commit comments

Comments
 (0)