From a091005106c9f1e55ed6842e8ba664e85bcd7c92 Mon Sep 17 00:00:00 2001 From: Spring Operator Date: Wed, 27 Mar 2019 12:48:25 -0700 Subject: [PATCH] URL Cleanup (#56) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://network.pivotal.io/open-source (301) with 1 occurrences migrated to: https://network.pivotal.io/open-source ([https](https://network.pivotal.io/open-source) result ReadTimeoutException). * [ ] http://foo.com:9999 (ConnectTimeoutException) with 12 occurrences migrated to: https://foo.com:9999 ([https](https://foo.com:9999) result ConnectTimeoutException). * [ ] http://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/ (UnknownHostException) with 2 occurrences migrated to: https://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/ ([https](https://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/) result UnknownHostException). * [ ] http://foo.bar.baz:9999/ (UnknownHostException) with 1 occurrences migrated to: https://foo.bar.baz:9999/ ([https](https://foo.bar.baz:9999/) result UnknownHostException). * [ ] http://foo.bar/ (UnknownHostException) with 4 occurrences migrated to: https://foo.bar/ ([https](https://foo.bar/) result UnknownHostException). * [ ] http://foo.bar/foo (UnknownHostException) with 4 occurrences migrated to: https://foo.bar/foo ([https](https://foo.bar/foo) result UnknownHostException). * [ ] http://foo.bar:8761/eureka/ (UnknownHostException) with 1 occurrences migrated to: https://foo.bar:8761/eureka/ ([https](https://foo.bar:8761/eureka/) result UnknownHostException). * [ ] http://foo.bar:8888 (UnknownHostException) with 1 occurrences migrated to: https://foo.bar:8888 ([https](https://foo.bar:8888) result UnknownHostException). * [ ] http://foo.bar:8888/ (UnknownHostException) with 1 occurrences migrated to: https://foo.bar:8888/ ([https](https://foo.bar:8888/) result UnknownHostException). * [ ] http://foo.bar:8888/,http://foo.bar.baz:9999/configPath (UnknownHostException) with 1 occurrences migrated to: https://foo.bar:8888/,http://foo.bar.baz:9999/configPath ([https](https://foo.bar:8888/,https://foo.bar.baz:9999/configPath) result UnknownHostException). * [ ] http://user:password@foo.com:9999 (UnknownHostException) with 8 occurrences migrated to: https://user:password@foo.com:9999 ([https](https://user:password@foo.com:9999) result UnknownHostException). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html with 2 occurrences migrated to: https://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html ([https](https://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html) result 200). * [ ] http://redis.io/ with 1 occurrences migrated to: https://redis.io/ ([https](https://redis.io/) result 200). * [ ] http://redis.io/documentation with 1 occurrences migrated to: https://redis.io/documentation ([https](https://redis.io/documentation) result 200). * [ ] http://redis.io/topics/license with 1 occurrences migrated to: https://redis.io/topics/license ([https](https://redis.io/topics/license) result 200). * [ ] http://aspnetwebstack.codeplex.com/wikipage?title=Contributors with 1 occurrences migrated to: https://aspnetwebstack.codeplex.com/wikipage?title=Contributors ([https](https://aspnetwebstack.codeplex.com/wikipage?title=Contributors) result 301). # Ignored These URLs were intentionally ignored. * http://localhost/Home/Health with 1 occurrences * http://localhost/Home/VerifyAsInjectedOptions with 3 occurrences * http://localhost:8761/eureka/ with 7 occurrences * http://localhost:8888 with 33 occurrences * http://localhost:8888/ with 16 occurrences * http://localhost:9999 with 1 occurrences * http://localhost:9999/ with 3 occurrences * http://localhost:9999/app/profile with 1 occurrences * http://localhost:9999/myPath/path with 1 occurrences * http://localhost:9999/myPath/path/ with 3 occurrences * http://user:password@localhost:8888/ with 1 occurrences --- open_source_licenses.txt | 10 +++++----- .../README.md | 2 +- ...udFoundryContainerBuilderExtensionsTest.cs | 4 ++-- .../CloudFoundryServiceOptionsTest.cs | 4 ++-- ...rConfigurationExtensionsIntegrationTest.cs | 2 +- ...figServerContainerBuilderExtensionsTest.cs | 4 ++-- ...erverConfigurationBuilderExtensionsTest.cs | 20 +++++++++---------- .../ConfigServerConfigurationProviderTest.cs | 14 ++++++------- .../ConfigServerDiscoveryServiceTest.cs | 2 +- ...rConfigurationBuilderExtensionsCoreTest.cs | 20 +++++++++---------- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/open_source_licenses.txt b/open_source_licenses.txt index 68ddc0c..d91743f 100644 --- a/open_source_licenses.txt +++ b/open_source_licenses.txt @@ -256,11 +256,11 @@ SOFTWARE. Third Party Licenses: -The Redis project (http://redis.io/) is independent of this client library, and +The Redis project (https://redis.io/) is independent of this client library, and is licensed separately under the three clause BSD license. The full license -information can be viewed here: http://redis.io/topics/license +information can be viewed here: https://redis.io/topics/license -This tool makes use of the "redis-doc" library from http://redis.io/documentation +This tool makes use of the "redis-doc" library from https://redis.io/documentation in the intellisense comments, which is licensed under the Creative Commons Attribution-ShareAlike 4.0 International license; full details are available here: @@ -592,7 +592,7 @@ Apache License, V2.0 is applicable to the following component(s). Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. Microsoft Open Technologies would like to thank its contributors, a list of whom -are at http://aspnetwebstack.codeplex.com/wikipage?title=Contributors. +are at https://aspnetwebstack.codeplex.com/wikipage?title=Contributors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may @@ -1555,7 +1555,7 @@ available (as would be noted above), you may obtain a copy of the source code corresponding to the binaries for such open source components and modifications thereto, if any, (the "Source Files"), by downloading the Source Files from Pivotal's website at -http://network.pivotal.io/open-source, or by sending a request, +https://network.pivotal.io/open-source, or by sending a request, with your name and address to: Pivotal Software, Inc., 875 Howard Street, 5th floor, San Francisco, CA 94103, Attention: General Counsel. All such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel. diff --git a/src/Steeltoe.Extensions.Configuration.ConfigServerBase/README.md b/src/Steeltoe.Extensions.Configuration.ConfigServerBase/README.md index bc669a1..4b05d76 100644 --- a/src/Steeltoe.Extensions.Configuration.ConfigServerBase/README.md +++ b/src/Steeltoe.Extensions.Configuration.ConfigServerBase/README.md @@ -1,5 +1,5 @@ # Spring Cloud Config .NET Configuration Provider -This project contains the [Spring Cloud Config Server](http://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html#_spring_cloud_config) client configuration provider. By acting as a client to the Spring Cloud Config Server, this provider enables the Config Server to become a source of configuration data for a .NET application. You can learn more about Cloud Native Applications and the Spring Cloud Config Server at [Spring Cloud](http://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html). +This project contains the [Spring Cloud Config Server](https://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html#_spring_cloud_config) client configuration provider. By acting as a client to the Spring Cloud Config Server, this provider enables the Config Server to become a source of configuration data for a .NET application. You can learn more about Cloud Native Applications and the Spring Cloud Config Server at [Spring Cloud](https://projects.spring.io/spring-cloud/docs/1.0.3/spring-cloud.html). For more information on how to use this component see the online [Steeltoe documentation](https://steeltoe.io/). \ No newline at end of file diff --git a/test/Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test/CloudFoundryContainerBuilderExtensionsTest.cs b/test/Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test/CloudFoundryContainerBuilderExtensionsTest.cs index 29f042f..e20fe9a 100644 --- a/test/Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test/CloudFoundryContainerBuilderExtensionsTest.cs +++ b/test/Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test/CloudFoundryContainerBuilderExtensionsTest.cs @@ -40,7 +40,7 @@ namespace Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test ContainerBuilder container = new ContainerBuilder(); var dict = new Dictionary() { - { "vcap:application:cf_api", "http://foo.bar/foo" }, + { "vcap:application:cf_api", "https://foo.bar/foo" }, { "vcap:application:application_id", "application_id" }, { "vcap:application:application_name", "application_name" }, { "vcap:services:p-config-server:0:name", "myConfigServer" }, @@ -57,7 +57,7 @@ namespace Steeltoe.Extensions.Configuration.CloudFoundryAutofac.Test var service = built.Resolve>(); Assert.NotNull(service); Assert.NotNull(service.Value); - Assert.Equal("http://foo.bar/foo", service.Value.CF_Api); + Assert.Equal("https://foo.bar/foo", service.Value.CF_Api); Assert.Equal("application_name", service.Value.ApplicationName); Assert.Equal("application_id", service.Value.ApplicationId); diff --git a/test/Steeltoe.Extensions.Configuration.CloudFoundryBase.Test/CloudFoundryServiceOptionsTest.cs b/test/Steeltoe.Extensions.Configuration.CloudFoundryBase.Test/CloudFoundryServiceOptionsTest.cs index 1e0ddd0..3ada728 100644 --- a/test/Steeltoe.Extensions.Configuration.CloudFoundryBase.Test/CloudFoundryServiceOptionsTest.cs +++ b/test/Steeltoe.Extensions.Configuration.CloudFoundryBase.Test/CloudFoundryServiceOptionsTest.cs @@ -134,9 +134,9 @@ namespace Steeltoe.Extensions.Configuration.CloudFoundry.Test 'username': '268371bd-07e5-46f3-aec7-d1633ae20bbb', 'port': 15672, 'host': '192.168.0.97', - 'uri': 'http://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/', + 'uri': 'https://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/', 'uris': [ - 'http://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/' + 'https://268371bd-07e5-46f3-aec7-d1633ae20bbb:3fnpvbqm0djq5jl9fp6fc697f4@192.168.0.97:15672/api/' ] }, 'amqp': { diff --git a/test/Steeltoe.Extensions.Configuration.ConfigServer.ITest/ConfigServerConfigurationExtensionsIntegrationTest.cs b/test/Steeltoe.Extensions.Configuration.ConfigServer.ITest/ConfigServerConfigurationExtensionsIntegrationTest.cs index c1f5e99..a20ce65 100644 --- a/test/Steeltoe.Extensions.Configuration.ConfigServer.ITest/ConfigServerConfigurationExtensionsIntegrationTest.cs +++ b/test/Steeltoe.Extensions.Configuration.ConfigServer.ITest/ConfigServerConfigurationExtensionsIntegrationTest.cs @@ -374,7 +374,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.ITest }, 'cloud': { 'config': { - 'uri': 'http://foo.bar:8888', + 'uri': 'https://foo.bar:8888', 'env': 'development', 'discovery': { 'enabled': true diff --git a/test/Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test/ConfigServerContainerBuilderExtensionsTest.cs b/test/Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test/ConfigServerContainerBuilderExtensionsTest.cs index 5bc5c75..62a0348 100644 --- a/test/Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test/ConfigServerContainerBuilderExtensionsTest.cs +++ b/test/Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test/ConfigServerContainerBuilderExtensionsTest.cs @@ -40,7 +40,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test ContainerBuilder container = new ContainerBuilder(); var dict = new Dictionary() { - { "spring:cloud:config:uri", "http://foo.bar/foo" }, + { "spring:cloud:config:uri", "https://foo.bar/foo" }, { "spring:cloud:config:env", "env" }, { "spring:cloud:config:label", "label" }, { "spring:cloud:config:name", "name" }, @@ -57,7 +57,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerAutofac.Test var service = built.Resolve>(); Assert.NotNull(service); Assert.NotNull(service.Value); - Assert.Equal("http://foo.bar/foo", service.Value.Uri); + Assert.Equal("https://foo.bar/foo", service.Value.Uri); Assert.Equal("env", service.Value.Env); Assert.Equal("label", service.Value.Label); Assert.Equal("name", service.Value.Name); diff --git a/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationBuilderExtensionsTest.cs b/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationBuilderExtensionsTest.cs index bf273db..910b291 100644 --- a/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationBuilderExtensionsTest.cs +++ b/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationBuilderExtensionsTest.cs @@ -92,7 +92,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test }, 'cloud': { 'config': { - 'uri': 'http://user:password@foo.com:9999', + 'uri': 'https://user:password@foo.com:9999', 'enabled': false, 'failFast': false, 'label': 'myLabel', @@ -133,7 +133,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://user:password@foo.com:9999", settings.Uri); + Assert.Equal("https://user:password@foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -157,7 +157,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test - http://foo.com:9999 + https://foo.com:9999 false false @@ -188,7 +188,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://foo.com:9999", settings.Uri); + Assert.Equal("https://foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -202,7 +202,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test // Arrange var appsettings = @" [spring:cloud:config] - uri=http://foo.com:9999 + uri=https://foo.com:9999 enabled=false failFast=false label=myLabel @@ -232,7 +232,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test // Act and Assert Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://foo.com:9999", settings.Uri); + Assert.Equal("https://foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -248,7 +248,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test { "spring:cloud:config:enabled=false", "--spring:cloud:config:failFast=false", - "/spring:cloud:config:uri=http://foo.com:9999", + "/spring:cloud:config:uri=https://foo.com:9999", "--spring:cloud:config:name", "myName", "/spring:cloud:config:label", "myLabel", "--spring:cloud:config:username", "myUsername", @@ -270,7 +270,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://foo.com:9999", settings.Uri); + Assert.Equal("https://foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -295,7 +295,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test }, 'cloud': { 'config': { - 'uri': 'http://user:password@foo.com:9999', + 'uri': 'https://user:password@foo.com:9999', 'enabled': false, 'failFast': false, 'name': '${foo:bar:name?foobar}', @@ -329,7 +329,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://user:password@foo.com:9999", settings.Uri); + Assert.Equal("https://user:password@foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("testName", settings.Name); Assert.Equal("myLabel", settings.Label); diff --git a/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationProviderTest.cs b/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationProviderTest.cs index 3603107..c1e5e4e 100644 --- a/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationProviderTest.cs +++ b/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerConfigurationProviderTest.cs @@ -779,7 +779,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test // Arrange ConfigServerClientSettings settings = new ConfigServerClientSettings { - AccessTokenUri = "http://foo.bar/", + AccessTokenUri = "https://foo.bar/", ClientId = "client_id", ClientSecret = "client_secret", Enabled = true, @@ -788,7 +788,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test Label = "label", Name = "name", Password = "password", - Uri = "http://foo.bar/", + Uri = "https://foo.bar/", Username = "username", ValidateCertificates = false, Token = "vaulttoken", @@ -801,7 +801,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test provider.AddConfigServerClientSettings(); Assert.True(provider.TryGet("spring:cloud:config:access_token_uri", out string value)); - Assert.Equal("http://foo.bar/", value); + Assert.Equal("https://foo.bar/", value); Assert.True(provider.TryGet("spring:cloud:config:client_id", out value)); Assert.Equal("client_id", value); Assert.True(provider.TryGet("spring:cloud:config:client_secret", out value)); @@ -815,7 +815,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test Assert.True(provider.TryGet("spring:cloud:config:password", out value)); Assert.Equal("password", value); Assert.True(provider.TryGet("spring:cloud:config:uri", out value)); - Assert.Equal("http://foo.bar/", value); + Assert.Equal("https://foo.bar/", value); Assert.True(provider.TryGet("spring:cloud:config:username", out value)); Assert.Equal("username", value); @@ -1034,14 +1034,14 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test var instances = new List() { - new TestServiceInfo(new Uri("http://foo.bar:8888/"), metadata1), - new TestServiceInfo(new Uri("http://foo.bar.baz:9999/"), metadata2) + new TestServiceInfo(new Uri("https://foo.bar:8888/"), metadata1), + new TestServiceInfo(new Uri("https://foo.bar.baz:9999/"), metadata2) }; provider.UpdateSettingsFromDiscovery(instances, settings); Assert.Equal("secondUser", settings.Username); Assert.Equal("secondPassword", settings.Password); - Assert.Equal("http://foo.bar:8888/,http://foo.bar.baz:9999/configPath", settings.Uri); + Assert.Equal("https://foo.bar:8888/,http://foo.bar.baz:9999/configPath", settings.Uri); } [Fact] diff --git a/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerDiscoveryServiceTest.cs b/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerDiscoveryServiceTest.cs index bdb5528..ebb2b47 100644 --- a/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerDiscoveryServiceTest.cs +++ b/test/Steeltoe.Extensions.Configuration.ConfigServerBase.Test/ConfigServerDiscoveryServiceTest.cs @@ -60,7 +60,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServer.Test { var values = new Dictionary() { - { "eureka:client:serviceUrl", "http://foo.bar:8761/eureka/" } + { "eureka:client:serviceUrl", "https://foo.bar:8761/eureka/" } }; var builder = new ConfigurationBuilder(); builder.AddInMemoryCollection(values); diff --git a/test/Steeltoe.Extensions.Configuration.ConfigServerCore.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs b/test/Steeltoe.Extensions.Configuration.ConfigServerCore.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs index 7b11b6a..aba759d 100644 --- a/test/Steeltoe.Extensions.Configuration.ConfigServerCore.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs +++ b/test/Steeltoe.Extensions.Configuration.ConfigServerCore.Test/ConfigServerConfigurationBuilderExtensionsCoreTest.cs @@ -95,7 +95,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test }, 'cloud': { 'config': { - 'uri': 'http://user:password@foo.com:9999', + 'uri': 'https://user:password@foo.com:9999', 'enabled': false, 'failFast': false, 'label': 'myLabel', @@ -136,7 +136,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://user:password@foo.com:9999", settings.Uri); + Assert.Equal("https://user:password@foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -235,7 +235,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test - http://foo.com:9999 + https://foo.com:9999 false false @@ -265,7 +265,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://foo.com:9999", settings.Uri); + Assert.Equal("https://foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -282,7 +282,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test // Arrange var appsettings = @" [spring:cloud:config] - uri=http://foo.com:9999 + uri=https://foo.com:9999 enabled=false failFast=false label=myLabel @@ -310,7 +310,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test // Act and Assert Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://foo.com:9999", settings.Uri); + Assert.Equal("https://foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -329,7 +329,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test { "spring:cloud:config:enabled=false", "--spring:cloud:config:failFast=false", - "/spring:cloud:config:uri=http://foo.com:9999", + "/spring:cloud:config:uri=https://foo.com:9999", "--spring:cloud:config:name", "myName", "/spring:cloud:config:label", "myLabel", "--spring:cloud:config:username", "myUsername", @@ -351,7 +351,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://foo.com:9999", settings.Uri); + Assert.Equal("https://foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("myName", settings.Name); Assert.Equal("myLabel", settings.Label); @@ -379,7 +379,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test }, 'cloud': { 'config': { - 'uri': 'http://user:password@foo.com:9999', + 'uri': 'https://user:password@foo.com:9999', 'enabled': false, 'failFast': false, 'name': '${foo:bar:name?foobar}', @@ -411,7 +411,7 @@ namespace Steeltoe.Extensions.Configuration.ConfigServerCore.Test Assert.False(settings.Enabled); Assert.False(settings.FailFast); - Assert.Equal("http://user:password@foo.com:9999", settings.Uri); + Assert.Equal("https://user:password@foo.com:9999", settings.Uri); Assert.Equal(ConfigServerClientSettings.DEFAULT_ENVIRONMENT, settings.Environment); Assert.Equal("testName", settings.Name); Assert.Equal("myLabel", settings.Label);