repo_name stringclasses 5 values | pr_number int64 1.52k 15.5k | pr_title stringlengths 8 143 | pr_description stringlengths 0 10.2k | author stringlengths 3 18 | date_created timestamp[ns, tz=UTC] | date_merged timestamp[ns, tz=UTC] | previous_commit stringlengths 40 40 | pr_commit stringlengths 40 40 | query stringlengths 11 10.2k | filepath stringlengths 6 220 | before_content stringlengths 0 597M | after_content stringlengths 0 597M | label int64 -1 1 |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/portal/controller/CommitControllerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import java.util.List;
import org.junit.Test;
import org.springframework.web.client.HttpClientErrorException;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
/**
* Created by kezhenxu at 2019/1/14 12:49.
*
* @author kezhenxu (kezhenxu at lizhi dot fm)
*/
public class CommitControllerTest extends AbstractIntegrationTest {
@Test
public void shouldFailWhenPageOrSiseIsNegative() {
try {
restTemplate.getForEntity(
url("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits?page=-1"),
List.class, "1", "env", "cl", "ns"
);
fail("should throw");
} catch (final HttpClientErrorException e) {
assertThat(
new String(e.getResponseBodyAsByteArray()), containsString("page should be positive or 0")
);
}
try {
restTemplate.getForEntity(
url("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits?size=0"),
List.class, "1", "env", "cl", "ns"
);
fail("should throw");
} catch (final HttpClientErrorException e) {
assertThat(
new String(e.getResponseBodyAsByteArray()), containsString("size should be positive number")
);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.portal.AbstractIntegrationTest;
import java.util.List;
import org.junit.Test;
import org.springframework.web.client.HttpClientErrorException;
import static org.hamcrest.core.StringContains.containsString;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
/**
* Created by kezhenxu at 2019/1/14 12:49.
*
* @author kezhenxu (kezhenxu at lizhi dot fm)
*/
public class CommitControllerTest extends AbstractIntegrationTest {
@Test
public void shouldFailWhenPageOrSiseIsNegative() {
try {
restTemplate.getForEntity(
url("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits?page=-1"),
List.class, "1", "env", "cl", "ns"
);
fail("should throw");
} catch (final HttpClientErrorException e) {
assertThat(
new String(e.getResponseBodyAsByteArray()), containsString("page should be positive or 0")
);
}
try {
restTemplate.getForEntity(
url("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/commits?size=0"),
List.class, "1", "env", "cl", "ns"
);
fail("should throw");
} catch (final HttpClientErrorException e) {
assertThat(
new String(e.getResponseBodyAsByteArray()), containsString("size should be positive number")
);
}
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/GrayReleaseRuleDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.google.common.collect.Sets;
import java.util.Set;
public class GrayReleaseRuleDTO extends BaseDTO {
private String appId;
private String clusterName;
private String namespaceName;
private String branchName;
private Set<GrayReleaseRuleItemDTO> ruleItems;
private Long releaseId;
public GrayReleaseRuleDTO(String appId, String clusterName, String namespaceName, String branchName) {
this.appId = appId;
this.clusterName = clusterName;
this.namespaceName = namespaceName;
this.branchName = branchName;
this.ruleItems = Sets.newHashSet();
}
public String getAppId() {
return appId;
}
public String getClusterName() {
return clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public String getBranchName() {
return branchName;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public void setRuleItems(Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleItems = ruleItems;
}
public void addRuleItem(GrayReleaseRuleItemDTO ruleItem) {
this.ruleItems.add(ruleItem);
}
public Long getReleaseId() {
return releaseId;
}
public void setReleaseId(Long releaseId) {
this.releaseId = releaseId;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.google.common.collect.Sets;
import java.util.Set;
public class GrayReleaseRuleDTO extends BaseDTO {
private String appId;
private String clusterName;
private String namespaceName;
private String branchName;
private Set<GrayReleaseRuleItemDTO> ruleItems;
private Long releaseId;
public GrayReleaseRuleDTO(String appId, String clusterName, String namespaceName, String branchName) {
this.appId = appId;
this.clusterName = clusterName;
this.namespaceName = namespaceName;
this.branchName = branchName;
this.ruleItems = Sets.newHashSet();
}
public String getAppId() {
return appId;
}
public String getClusterName() {
return clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public String getBranchName() {
return branchName;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public void setRuleItems(Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleItems = ruleItems;
}
public void addRuleItem(GrayReleaseRuleItemDTO ruleItem) {
this.ruleItems.add(ruleItem);
}
public Long getReleaseId() {
return releaseId;
}
public void setReleaseId(Long releaseId) {
this.releaseId = releaseId;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/directive/namespace-panel-directive.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
directive_module.directive('apollonspanel', directive);
function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService,
UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html',
transclude: true,
replace: true,
scope: {
namespace: '=',
appId: '=',
env: '=',
cluster: '=',
user: '=',
lockCheck: '=',
createItem: '=',
editItem: '=',
preDeleteItem: '=',
preRevokeItem: '=',
showText: '=',
showNoModifyPermissionDialog: '=',
preCreateBranch: '=',
preDeleteBranch: '=',
showMergeAndPublishGrayTips: '=',
showBody: "=?",
lazyLoad: "=?"
},
link: function (scope) {
//constants
var namespace_view_type = {
TEXT: 'text',
TABLE: 'table',
HISTORY: 'history',
INSTANCE: 'instance',
RULE: 'rule'
};
var namespace_instance_view_type = {
LATEST_RELEASE: 'latest_release',
NOT_LATEST_RELEASE: 'not_latest_release',
ALL: 'all'
};
var operate_branch_storage_key = 'OperateBranch';
scope.refreshNamespace = refreshNamespace;
scope.switchView = switchView;
scope.toggleItemSearchInput = toggleItemSearchInput;
scope.searchItems = searchItems;
scope.loadCommitHistory = loadCommitHistory;
scope.toggleTextEditStatus = toggleTextEditStatus;
scope.goToSyncPage = goToSyncPage;
scope.goToDiffPage = goToDiffPage;
scope.modifyByText = modifyByText;
scope.syntaxCheck = syntaxCheck;
scope.goToParentAppConfigPage = goToParentAppConfigPage;
scope.switchInstanceViewType = switchInstanceViewType;
scope.switchBranch = switchBranch;
scope.loadInstanceInfo = loadInstanceInfo;
scope.refreshInstancesInfo = refreshInstancesInfo;
scope.deleteRuleItem = deleteRuleItem;
scope.rollback = rollback;
scope.publish = publish;
scope.mergeAndPublish = mergeAndPublish;
scope.addRuleItem = addRuleItem;
scope.editRuleItem = editRuleItem;
scope.deleteNamespace = deleteNamespace;
var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
function (context) {
useRules(context.branch);
}, scope.namespace.baseInfo.namespaceName);
scope.$on('$destroy', function () {
EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
subscriberId, scope.namespace.baseInfo.namespaceName);
});
preInit(scope.namespace);
if (!scope.lazyLoad || scope.namespace.initialized) {
init();
}
function preInit(namespace) {
scope.showNamespaceBody = false;
namespace.isLinkedNamespace =
namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false;
//namespace view name hide suffix
namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace(
".properties", "").replace(".json", "").replace(".yml", "")
.replace(".yaml", "").replace(".txt", "");
}
function init() {
initNamespace(scope.namespace);
initOther();
scope.namespace.initialized = true;
}
function refreshNamespace() {
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{ namespace: scope.namespace });
}
function initNamespace(namespace, viewType) {
namespace.hasBranch = false;
namespace.isBranch = false;
namespace.displayControl = {
currentOperateBranch: 'master',
showSearchInput: false,
show: scope.showBody
};
scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody;
namespace.viewItems = namespace.items;
namespace.isPropertiesFormat = namespace.format == 'properties';
namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml';
namespace.isTextEditing = false;
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.allInstances = [];
namespace.allInstancesPage = 0;
namespace.commitChangeBtnDisabled = false;
generateNamespaceId(namespace);
initNamespaceBranch(namespace);
initNamespaceViewName(namespace);
initNamespaceLock(namespace);
initNamespaceInstancesCount(namespace);
initPermission(namespace);
initLinkedNamespace(namespace);
loadInstanceInfo(namespace);
function initNamespaceBranch(namespace) {
NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.baseInfo) {
return;
}
//namespace has branch
namespace.hasBranch = true;
namespace.branchName = result.baseInfo.clusterName;
//init branch
namespace.branch = result;
namespace.branch.isBranch = true;
namespace.branch.parentNamespace = namespace;
namespace.branch.viewType = namespace_view_type.TABLE;
namespace.branch.isPropertiesFormat = namespace.format == 'properties';
namespace.branch.allInstances = [];//master namespace all instances
namespace.branch.latestReleaseInstances = [];
namespace.branch.latestReleaseInstancesPage = 0;
namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.branch.hasLoadInstances = false;
namespace.branch.displayControl = {
show: true
};
generateNamespaceId(namespace.branch);
initBranchItems(namespace.branch);
initRules(namespace.branch);
loadInstanceInfo(namespace.branch);
initNamespaceLock(namespace.branch);
initPermission(namespace);
initUserOperateBranchScene(namespace);
});
function initBranchItems(branch) {
branch.masterItems = [];
branch.branchItems = [];
var masterItemsMap = {};
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
masterItemsMap[item.item.key] = item;
}
});
var branchItemsMap = {};
var itemModifiedCnt = 0;
branch.items.forEach(function (item) {
var key = item.item.key;
var masterItem = masterItemsMap[key];
//modify master item and set item's masterReleaseValue
if (masterItem) {
item.masterItemExists = true;
if (masterItem.isModified) {
item.masterReleaseValue = masterItem.oldValue;
} else {
item.masterReleaseValue = masterItem.item.value;
}
} else {//delete branch item
item.masterItemExists = false;
}
//delete master item. ignore
if (item.isDeleted && masterItem) {
if (item.masterReleaseValue != item.oldValue) {
itemModifiedCnt++;
branch.branchItems.push(item);
}
} else {//branch's item
branchItemsMap[key] = item;
if (item.isModified) {
itemModifiedCnt++;
}
branch.branchItems.push(item);
}
});
branch.itemModifiedCnt = itemModifiedCnt;
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
if (!branchItemsMap[item.item.key]) {
branch.masterItems.push(item);
} else {
item.hasBranchValue = true;
}
}
})
}
}
function generateNamespaceId(namespace) {
namespace.id = Math.random().toString(36).substr(2);
}
function initPermission(namespace) {
PermissionService.has_modify_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_modify_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
}
});
PermissionService.has_release_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_release_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
}
});
}
function initLinkedNamespace(namespace) {
if (!namespace.isPublic || !namespace.isLinkedNamespace) {
return;
}
//load public namespace
ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
var publicNamespace = result;
namespace.publicNamespace = publicNamespace;
var linkNamespaceItemKeys = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
linkNamespaceItemKeys.push(key);
});
publicNamespace.viewItems = [];
publicNamespace.items.forEach(function (item) {
var key = item.item.key;
if (key) {
publicNamespace.viewItems.push(item);
}
item.covered = linkNamespaceItemKeys.indexOf(key) >= 0;
if (item.isModified || item.isDeleted) {
publicNamespace.isModified = true;
} else if (key) {
publicNamespace.hasPublishedItem = true;
}
});
loadParentNamespaceText(namespace);
});
}
function loadParentNamespaceText(namespace){
namespace.publicNamespaceText = "";
if(namespace.isLinkedNamespace) {
namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace)
}
}
function initNamespaceViewName(namespace) {
if (!viewType) {
if (namespace.isPropertiesFormat) {
switchView(namespace, namespace_view_type.TABLE);
} else {
switchView(namespace, namespace_view_type.TEXT);
}
} else if (viewType == namespace_view_type.TABLE) {
namespace.viewType = namespace_view_type.TABLE;
}
}
function initNamespaceLock(namespace) {
NamespaceLockService.get_namespace_lock(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.lockOwner = result.lockOwner;
namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed;
});
}
function initUserOperateBranchScene(namespace) {
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join(
"+");
if (!operateBranchStorage) {
operateBranchStorage = {};
}
if (!operateBranchStorage[namespaceId]) {
operateBranchStorage[namespaceId] = namespace.branchName;
}
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
switchBranch(operateBranchStorage[namespaceId], false);
}
}
function initNamespaceInstancesCount(namespace) {
InstanceService.getInstanceCountByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.instancesCount = result.num;
})
}
function initOther() {
UserService.load_user().then(function (result) {
scope.currentUser = result.userId;
});
PermissionService.has_assign_user_permission(scope.appId)
.then(function (result) {
scope.hasAssignUserPermission = result.hasPermission;
}, function (result) {
});
}
function switchBranch(branchName, forceShowBody) {
if (branchName != 'master') {
initRules(scope.namespace.branch);
}
if (forceShowBody) {
scope.showNamespaceBody = true;
}
scope.namespace.displayControl.currentOperateBranch = branchName;
//save to local storage
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
if (!operateBranchStorage) {
return;
}
var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join(
"+");
operateBranchStorage[namespaceId] = branchName;
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
}
function switchView(namespace, viewType) {
namespace.viewType = viewType;
if (namespace_view_type.TEXT == viewType) {
namespace.text = parseModel2Text(namespace);
} else if (namespace_view_type.TABLE == viewType) {
} else if (namespace_view_type.HISTORY == viewType) {
loadCommitHistory(namespace);
} else if (namespace_view_type.INSTANCE == viewType) {
refreshInstancesInfo(namespace);
}
}
function switchInstanceViewType(namespace, type) {
namespace.instanceViewType = type;
loadInstanceInfo(namespace);
}
function loadCommitHistory(namespace) {
if (!namespace.commits) {
namespace.commits = [];
namespace.commitPage = 0;
}
var size = 10;
CommitService.find_commits(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName,
namespace.commitPage,
size)
.then(function (result) {
if (result.length < size) {
namespace.hasLoadAllCommit = true;
}
for (var i = 0; i < result.length; i++) {
//to json
result[i].changeSets = JSON.parse(result[i].changeSets);
namespace.commits.push(result[i]);
}
namespace.commitPage += 1;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError'));
});
}
function loadInstanceInfo(namespace) {
var size = 20;
if (namespace.isBranch) {
size = 2000;
}
var type = namespace.instanceViewType;
if (namespace_instance_view_type.LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
ReleaseService.findLatestActiveRelease(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.isLatestReleaseLoaded = true;
if (!result) {
namespace.latestReleaseInstances = {};
namespace.latestReleaseInstances.total = 0;
return;
}
namespace.latestRelease = result;
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
namespace.latestReleaseInstances = result;
namespace.latestReleaseInstancesPage++;
})
});
} else {
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
if (result && result.content.length) {
namespace.latestReleaseInstancesPage++;
result.content.forEach(function (instance) {
namespace.latestReleaseInstances.content.push(
instance);
})
}
})
}
} else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
return;
}
InstanceService.findByReleasesNotIn(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
namespace.latestRelease.id)
.then(function (result) {
if (!result || result.length == 0) {
return
}
var groupedInstances = {},
notLatestReleases = [];
result.forEach(function (instance) {
var configs = instance.configs;
if (configs && configs.length > 0) {
configs.forEach(function (instanceConfig) {
var release = instanceConfig.release;
//filter dirty data
if (!release) {
return;
}
if (!groupedInstances[release.id]) {
groupedInstances[release.id] = [];
notLatestReleases.push(release);
}
groupedInstances[release.id].push(instance);
})
}
});
namespace.notLatestReleases = notLatestReleases;
namespace.notLatestReleaseInstances = groupedInstances;
})
} else {
InstanceService.findInstancesByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
'',
namespace.allInstancesPage)
.then(function (result) {
if (result && result.content.length) {
namespace.allInstancesPage++;
result.content.forEach(function (instance) {
namespace.allInstances.push(instance);
})
}
});
}
}
function refreshInstancesInfo(namespace) {
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.latestReleaseInstances = [];
namespace.latestRelease = undefined;
if (!namespace.isBranch) {
namespace.notLatestReleaseNames = [];
namespace.notLatestReleaseInstances = {};
namespace.allInstancesPage = 0;
namespace.allInstances = [];
}
initNamespaceInstancesCount(namespace);
loadInstanceInfo(namespace);
}
function initRules(branch) {
NamespaceBranchService.findBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName)
.then(function (result) {
if (result.appId) {
branch.rules = result;
}
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError'));
});
}
function addRuleItem(branch) {
var newRuleItem = {
clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '',
clientIpList: [],
draftIpList: [],
isNew: true
};
branch.editingRuleItem = newRuleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function editRuleItem(branch, ruleItem) {
ruleItem.isNew = false;
ruleItem.draftIpList = _.clone(ruleItem.clientIpList);
branch.editingRuleItem = ruleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function deleteRuleItem(branch, ruleItem) {
branch.rules.ruleItems.forEach(function (item, index) {
if (item.clientAppId == ruleItem.clientAppId) {
branch.rules.ruleItems.splice(index, 1);
toastr.success($translate.instant('ApolloNsPanel.Deleted'));
}
});
useRules(branch);
}
function useRules(branch) {
NamespaceBranchService.updateBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName,
branch.rules
)
.then(function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified'));
//show tips if branch has not release configs
if (branch.itemModifiedCnt) {
AppUtil.showModal("#updateRuleTips");
}
setTimeout(function () {
refreshInstancesInfo(branch);
}, 1500);
}, function (result) {
AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed'));
})
}
function toggleTextEditStatus(namespace) {
if (!scope.lockCheck(namespace)) {
return;
}
namespace.isTextEditing = !namespace.isTextEditing;
if (namespace.isTextEditing) {//切换为编辑状态
namespace.commited = false;
namespace.backupText = namespace.text;
namespace.editText = parseModel2Text(namespace);
} else {
if (!namespace.commited) {//取消编辑,则复原
namespace.text = namespace.backupText;
}
}
}
function goToSyncPage(namespace) {
if (!scope.lockCheck(namespace)) {
return false;
}
$window.location.href =
AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function goToDiffPage(namespace) {
$window.location.href =
AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function modifyByText(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
//prevent repeat submit
if (namespace.commitChangeBtnDisabled) {
return;
}
namespace.commitChangeBtnDisabled = true;
ConfigService.modify_items(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.ModifiedTips'));
//refresh all namespace items
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: namespace
});
return true;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed'));
namespace.commitChangeBtnDisabled = false;
return false;
}
);
namespace.commited = true;
}
function syntaxCheck(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
ConfigService.syntax_check_text(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight'));
}, function (result) {
EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, {
syntaxCheckMessage: AppUtil.pureErrorMsg(result)
});
}
);
}
function goToParentAppConfigPage(namespace) {
$window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId;
$window.location.reload();
}
function parseModel2Text(namespace) {
if (namespace.items.length == 0) {
namespace.itemCnt = 0;
return "";
}
//文件模式
if (!namespace.isPropertiesFormat) {
return parseNotPropertiesText(namespace);
} else {
return parsePropertiesText(namespace);
}
}
function parseNotPropertiesText(namespace) {
var text = namespace.items[0].item.value;
var lineNum = text.split("\n").length;
namespace.itemCnt = lineNum;
return text;
}
function parsePropertiesText(namespace) {
var result = "";
var itemCnt = 0;
namespace.items.forEach(function (item) {
//deleted key
if (!item.item.dataChangeLastModifiedBy) {
return;
}
if (item.item.key) {
//use string \n to display as new line
var itemValue = item.item.value.replace(/\n/g, "\\n");
result +=
item.item.key + " = " + itemValue + "\n";
} else {
result += item.item.comment + "\n";
}
itemCnt++;
});
namespace.itemCnt = itemCnt;
return result;
}
function toggleItemSearchInput(namespace) {
namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput;
}
function searchItems(namespace) {
var searchKey = namespace.searchKey.toLowerCase();
var items = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
if (key && key.toLowerCase().indexOf(searchKey) >= 0) {
items.push(item);
}
});
namespace.viewItems = items;
}
//normal release and gray release
function publish(namespace) {
if (!namespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
return;
} else if (namespace.lockOwner && scope.user == namespace.lockOwner) {
//can not publish if config modified by himself
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: namespace,
mergeAndPublish: false
});
return;
}
if (namespace.isBranch) {
namespace.mergeAndPublish = false;
}
EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE,
{
namespace: namespace
});
}
function mergeAndPublish(branch) {
var parentNamespace = branch.parentNamespace;
if (!parentNamespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
} else if (parentNamespace.itemModifiedCnt > 0) {
AppUtil.showModal('#mergeAndReleaseDenyDialog');
} else if (branch.lockOwner && scope.user == branch.lockOwner) {
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: branch,
mergeAndPublish: true
});
} else {
EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch });
}
}
function rollback(namespace) {
EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace });
}
function deleteNamespace(namespace) {
EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace });
}
//theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min
scope.aceConfig = {
$blockScrolling: Infinity,
showPrintMargin: false,
theme: 'eclipse',
mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format),
onLoad: function (_editor) {
_editor.$blockScrolling = Infinity;
_editor.setOptions({
fontSize: 13,
minLines: 10,
maxLines: 20
})
}
};
setTimeout(function () {
scope.namespace.show = true;
}, 70);
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
directive_module.directive('apollonspanel', directive);
function directive($window, $translate, toastr, AppUtil, EventManager, PermissionService, NamespaceLockService,
UserService, CommitService, ReleaseService, InstanceService, NamespaceBranchService, ConfigService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/namespace-panel.html',
transclude: true,
replace: true,
scope: {
namespace: '=',
appId: '=',
env: '=',
cluster: '=',
user: '=',
lockCheck: '=',
createItem: '=',
editItem: '=',
preDeleteItem: '=',
preRevokeItem: '=',
showText: '=',
showNoModifyPermissionDialog: '=',
preCreateBranch: '=',
preDeleteBranch: '=',
showMergeAndPublishGrayTips: '=',
showBody: "=?",
lazyLoad: "=?"
},
link: function (scope) {
//constants
var namespace_view_type = {
TEXT: 'text',
TABLE: 'table',
HISTORY: 'history',
INSTANCE: 'instance',
RULE: 'rule'
};
var namespace_instance_view_type = {
LATEST_RELEASE: 'latest_release',
NOT_LATEST_RELEASE: 'not_latest_release',
ALL: 'all'
};
var operate_branch_storage_key = 'OperateBranch';
scope.refreshNamespace = refreshNamespace;
scope.switchView = switchView;
scope.toggleItemSearchInput = toggleItemSearchInput;
scope.searchItems = searchItems;
scope.loadCommitHistory = loadCommitHistory;
scope.toggleTextEditStatus = toggleTextEditStatus;
scope.goToSyncPage = goToSyncPage;
scope.goToDiffPage = goToDiffPage;
scope.modifyByText = modifyByText;
scope.syntaxCheck = syntaxCheck;
scope.goToParentAppConfigPage = goToParentAppConfigPage;
scope.switchInstanceViewType = switchInstanceViewType;
scope.switchBranch = switchBranch;
scope.loadInstanceInfo = loadInstanceInfo;
scope.refreshInstancesInfo = refreshInstancesInfo;
scope.deleteRuleItem = deleteRuleItem;
scope.rollback = rollback;
scope.publish = publish;
scope.mergeAndPublish = mergeAndPublish;
scope.addRuleItem = addRuleItem;
scope.editRuleItem = editRuleItem;
scope.deleteNamespace = deleteNamespace;
var subscriberId = EventManager.subscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
function (context) {
useRules(context.branch);
}, scope.namespace.baseInfo.namespaceName);
scope.$on('$destroy', function () {
EventManager.unsubscribe(EventManager.EventType.UPDATE_GRAY_RELEASE_RULES,
subscriberId, scope.namespace.baseInfo.namespaceName);
});
preInit(scope.namespace);
if (!scope.lazyLoad || scope.namespace.initialized) {
init();
}
function preInit(namespace) {
scope.showNamespaceBody = false;
namespace.isLinkedNamespace =
namespace.isPublic ? namespace.parentAppId != namespace.baseInfo.appId : false;
//namespace view name hide suffix
namespace.viewName = namespace.baseInfo.namespaceName.replace(".xml", "").replace(
".properties", "").replace(".json", "").replace(".yml", "")
.replace(".yaml", "").replace(".txt", "");
}
function init() {
initNamespace(scope.namespace);
initOther();
scope.namespace.initialized = true;
}
function refreshNamespace() {
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{ namespace: scope.namespace });
}
function initNamespace(namespace, viewType) {
namespace.hasBranch = false;
namespace.isBranch = false;
namespace.displayControl = {
currentOperateBranch: 'master',
showSearchInput: false,
show: scope.showBody
};
scope.showNamespaceBody = namespace.showNamespaceBody ? true : scope.showBody;
namespace.viewItems = namespace.items;
namespace.isPropertiesFormat = namespace.format == 'properties';
namespace.isSyntaxCheckable = namespace.format == 'yaml' || namespace.format == 'yml';
namespace.isTextEditing = false;
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.allInstances = [];
namespace.allInstancesPage = 0;
namespace.commitChangeBtnDisabled = false;
generateNamespaceId(namespace);
initNamespaceBranch(namespace);
initNamespaceViewName(namespace);
initNamespaceLock(namespace);
initNamespaceInstancesCount(namespace);
initPermission(namespace);
initLinkedNamespace(namespace);
loadInstanceInfo(namespace);
function initNamespaceBranch(namespace) {
NamespaceBranchService.findNamespaceBranch(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.baseInfo) {
return;
}
//namespace has branch
namespace.hasBranch = true;
namespace.branchName = result.baseInfo.clusterName;
//init branch
namespace.branch = result;
namespace.branch.isBranch = true;
namespace.branch.parentNamespace = namespace;
namespace.branch.viewType = namespace_view_type.TABLE;
namespace.branch.isPropertiesFormat = namespace.format == 'properties';
namespace.branch.allInstances = [];//master namespace all instances
namespace.branch.latestReleaseInstances = [];
namespace.branch.latestReleaseInstancesPage = 0;
namespace.branch.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.branch.hasLoadInstances = false;
namespace.branch.displayControl = {
show: true
};
generateNamespaceId(namespace.branch);
initBranchItems(namespace.branch);
initRules(namespace.branch);
loadInstanceInfo(namespace.branch);
initNamespaceLock(namespace.branch);
initPermission(namespace);
initUserOperateBranchScene(namespace);
});
function initBranchItems(branch) {
branch.masterItems = [];
branch.branchItems = [];
var masterItemsMap = {};
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
masterItemsMap[item.item.key] = item;
}
});
var branchItemsMap = {};
var itemModifiedCnt = 0;
branch.items.forEach(function (item) {
var key = item.item.key;
var masterItem = masterItemsMap[key];
//modify master item and set item's masterReleaseValue
if (masterItem) {
item.masterItemExists = true;
if (masterItem.isModified) {
item.masterReleaseValue = masterItem.oldValue;
} else {
item.masterReleaseValue = masterItem.item.value;
}
} else {//delete branch item
item.masterItemExists = false;
}
//delete master item. ignore
if (item.isDeleted && masterItem) {
if (item.masterReleaseValue != item.oldValue) {
itemModifiedCnt++;
branch.branchItems.push(item);
}
} else {//branch's item
branchItemsMap[key] = item;
if (item.isModified) {
itemModifiedCnt++;
}
branch.branchItems.push(item);
}
});
branch.itemModifiedCnt = itemModifiedCnt;
branch.parentNamespace.items.forEach(function (item) {
if (item.item.key) {
if (!branchItemsMap[item.item.key]) {
branch.masterItems.push(item);
} else {
item.hasBranchValue = true;
}
}
})
}
}
function generateNamespaceId(namespace) {
namespace.id = Math.random().toString(36).substr(2);
}
function initPermission(namespace) {
PermissionService.has_modify_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_modify_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasModifyPermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasModifyPermission = result.hasPermission;
}
}
});
PermissionService.has_release_namespace_permission(
scope.appId,
namespace.baseInfo.namespaceName)
.then(function (result) {
if (!result.hasPermission) {
PermissionService.has_release_namespace_env_permission(
scope.appId,
scope.env,
namespace.baseInfo.namespaceName
)
.then(function (result) {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
});
}
else {
//branch has same permission
namespace.hasReleasePermission = result.hasPermission;
if (namespace.branch) {
namespace.branch.hasReleasePermission = result.hasPermission;
}
}
});
}
function initLinkedNamespace(namespace) {
if (!namespace.isPublic || !namespace.isLinkedNamespace) {
return;
}
//load public namespace
ConfigService.load_public_namespace_for_associated_namespace(scope.env, scope.appId, scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
var publicNamespace = result;
namespace.publicNamespace = publicNamespace;
var linkNamespaceItemKeys = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
linkNamespaceItemKeys.push(key);
});
publicNamespace.viewItems = [];
publicNamespace.items.forEach(function (item) {
var key = item.item.key;
if (key) {
publicNamespace.viewItems.push(item);
}
item.covered = linkNamespaceItemKeys.indexOf(key) >= 0;
if (item.isModified || item.isDeleted) {
publicNamespace.isModified = true;
} else if (key) {
publicNamespace.hasPublishedItem = true;
}
});
loadParentNamespaceText(namespace);
});
}
function loadParentNamespaceText(namespace){
namespace.publicNamespaceText = "";
if(namespace.isLinkedNamespace) {
namespace.publicNamespaceText = parseModel2Text(namespace.publicNamespace)
}
}
function initNamespaceViewName(namespace) {
if (!viewType) {
if (namespace.isPropertiesFormat) {
switchView(namespace, namespace_view_type.TABLE);
} else {
switchView(namespace, namespace_view_type.TEXT);
}
} else if (viewType == namespace_view_type.TABLE) {
namespace.viewType = namespace_view_type.TABLE;
}
}
function initNamespaceLock(namespace) {
NamespaceLockService.get_namespace_lock(scope.appId, scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.lockOwner = result.lockOwner;
namespace.isEmergencyPublishAllowed = result.isEmergencyPublishAllowed;
});
}
function initUserOperateBranchScene(namespace) {
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
var namespaceId = [scope.appId, scope.env, scope.cluster, namespace.baseInfo.namespaceName].join(
"+");
if (!operateBranchStorage) {
operateBranchStorage = {};
}
if (!operateBranchStorage[namespaceId]) {
operateBranchStorage[namespaceId] = namespace.branchName;
}
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
switchBranch(operateBranchStorage[namespaceId], false);
}
}
function initNamespaceInstancesCount(namespace) {
InstanceService.getInstanceCountByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.instancesCount = result.num;
})
}
function initOther() {
UserService.load_user().then(function (result) {
scope.currentUser = result.userId;
});
PermissionService.has_assign_user_permission(scope.appId)
.then(function (result) {
scope.hasAssignUserPermission = result.hasPermission;
}, function (result) {
});
}
function switchBranch(branchName, forceShowBody) {
if (branchName != 'master') {
initRules(scope.namespace.branch);
}
if (forceShowBody) {
scope.showNamespaceBody = true;
}
scope.namespace.displayControl.currentOperateBranch = branchName;
//save to local storage
var operateBranchStorage = JSON.parse(localStorage.getItem(operate_branch_storage_key));
if (!operateBranchStorage) {
return;
}
var namespaceId = [scope.appId, scope.env, scope.cluster, scope.namespace.baseInfo.namespaceName].join(
"+");
operateBranchStorage[namespaceId] = branchName;
localStorage.setItem(operate_branch_storage_key, JSON.stringify(operateBranchStorage));
}
function switchView(namespace, viewType) {
namespace.viewType = viewType;
if (namespace_view_type.TEXT == viewType) {
namespace.text = parseModel2Text(namespace);
} else if (namespace_view_type.TABLE == viewType) {
} else if (namespace_view_type.HISTORY == viewType) {
loadCommitHistory(namespace);
} else if (namespace_view_type.INSTANCE == viewType) {
refreshInstancesInfo(namespace);
}
}
function switchInstanceViewType(namespace, type) {
namespace.instanceViewType = type;
loadInstanceInfo(namespace);
}
function loadCommitHistory(namespace) {
if (!namespace.commits) {
namespace.commits = [];
namespace.commitPage = 0;
}
var size = 10;
CommitService.find_commits(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName,
namespace.commitPage,
size)
.then(function (result) {
if (result.length < size) {
namespace.hasLoadAllCommit = true;
}
for (var i = 0; i < result.length; i++) {
//to json
result[i].changeSets = JSON.parse(result[i].changeSets);
namespace.commits.push(result[i]);
}
namespace.commitPage += 1;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingHistoryError'));
});
}
function loadInstanceInfo(namespace) {
var size = 20;
if (namespace.isBranch) {
size = 2000;
}
var type = namespace.instanceViewType;
if (namespace_instance_view_type.LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
ReleaseService.findLatestActiveRelease(scope.appId,
scope.env,
namespace.baseInfo.clusterName,
namespace.baseInfo.namespaceName)
.then(function (result) {
namespace.isLatestReleaseLoaded = true;
if (!result) {
namespace.latestReleaseInstances = {};
namespace.latestReleaseInstances.total = 0;
return;
}
namespace.latestRelease = result;
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
namespace.latestReleaseInstances = result;
namespace.latestReleaseInstancesPage++;
})
});
} else {
InstanceService.findInstancesByRelease(scope.env,
namespace.latestRelease.id,
namespace.latestReleaseInstancesPage,
size)
.then(function (result) {
if (result && result.content.length) {
namespace.latestReleaseInstancesPage++;
result.content.forEach(function (instance) {
namespace.latestReleaseInstances.content.push(
instance);
})
}
})
}
} else if (namespace_instance_view_type.NOT_LATEST_RELEASE == type) {
if (!namespace.latestRelease) {
return;
}
InstanceService.findByReleasesNotIn(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
namespace.latestRelease.id)
.then(function (result) {
if (!result || result.length == 0) {
return
}
var groupedInstances = {},
notLatestReleases = [];
result.forEach(function (instance) {
var configs = instance.configs;
if (configs && configs.length > 0) {
configs.forEach(function (instanceConfig) {
var release = instanceConfig.release;
//filter dirty data
if (!release) {
return;
}
if (!groupedInstances[release.id]) {
groupedInstances[release.id] = [];
notLatestReleases.push(release);
}
groupedInstances[release.id].push(instance);
})
}
});
namespace.notLatestReleases = notLatestReleases;
namespace.notLatestReleaseInstances = groupedInstances;
})
} else {
InstanceService.findInstancesByNamespace(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
'',
namespace.allInstancesPage)
.then(function (result) {
if (result && result.content.length) {
namespace.allInstancesPage++;
result.content.forEach(function (instance) {
namespace.allInstances.push(instance);
})
}
});
}
}
function refreshInstancesInfo(namespace) {
namespace.instanceViewType = namespace_instance_view_type.LATEST_RELEASE;
namespace.latestReleaseInstancesPage = 0;
namespace.latestReleaseInstances = [];
namespace.latestRelease = undefined;
if (!namespace.isBranch) {
namespace.notLatestReleaseNames = [];
namespace.notLatestReleaseInstances = {};
namespace.allInstancesPage = 0;
namespace.allInstances = [];
}
initNamespaceInstancesCount(namespace);
loadInstanceInfo(namespace);
}
function initRules(branch) {
NamespaceBranchService.findBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName)
.then(function (result) {
if (result.appId) {
branch.rules = result;
}
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.LoadingGrayscaleError'));
});
}
function addRuleItem(branch) {
var newRuleItem = {
clientAppId: !branch.parentNamespace.isPublic ? branch.baseInfo.appId : '',
clientIpList: [],
draftIpList: [],
isNew: true
};
branch.editingRuleItem = newRuleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function editRuleItem(branch, ruleItem) {
ruleItem.isNew = false;
ruleItem.draftIpList = _.clone(ruleItem.clientIpList);
branch.editingRuleItem = ruleItem;
EventManager.emit(EventManager.EventType.EDIT_GRAY_RELEASE_RULES, {
branch: branch
});
}
function deleteRuleItem(branch, ruleItem) {
branch.rules.ruleItems.forEach(function (item, index) {
if (item.clientAppId == ruleItem.clientAppId) {
branch.rules.ruleItems.splice(index, 1);
toastr.success($translate.instant('ApolloNsPanel.Deleted'));
}
});
useRules(branch);
}
function useRules(branch) {
NamespaceBranchService.updateBranchGrayRules(scope.appId,
scope.env,
scope.cluster,
scope.namespace.baseInfo.namespaceName,
branch.baseInfo.clusterName,
branch.rules
)
.then(function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrayscaleModified'));
//show tips if branch has not release configs
if (branch.itemModifiedCnt) {
AppUtil.showModal("#updateRuleTips");
}
setTimeout(function () {
refreshInstancesInfo(branch);
}, 1500);
}, function (result) {
AppUtil.showErrorMsg(result, $translate.instant('ApolloNsPanel.GrayscaleModifyFailed'));
})
}
function toggleTextEditStatus(namespace) {
if (!scope.lockCheck(namespace)) {
return;
}
namespace.isTextEditing = !namespace.isTextEditing;
if (namespace.isTextEditing) {//切换为编辑状态
namespace.commited = false;
namespace.backupText = namespace.text;
namespace.editText = parseModel2Text(namespace);
} else {
if (!namespace.commited) {//取消编辑,则复原
namespace.text = namespace.backupText;
}
}
}
function goToSyncPage(namespace) {
if (!scope.lockCheck(namespace)) {
return false;
}
$window.location.href =
AppUtil.prefixPath() + "/config/sync.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function goToDiffPage(namespace) {
$window.location.href =
AppUtil.prefixPath() + "/config/diff.html?#/appid=" + scope.appId + "&env="
+ scope.env + "&clusterName="
+ scope.cluster
+ "&namespaceName=" + namespace.baseInfo.namespaceName;
}
function modifyByText(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
//prevent repeat submit
if (namespace.commitChangeBtnDisabled) {
return;
}
namespace.commitChangeBtnDisabled = true;
ConfigService.modify_items(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.ModifiedTips'));
//refresh all namespace items
EventManager.emit(EventManager.EventType.REFRESH_NAMESPACE,
{
namespace: namespace
});
return true;
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('ApolloNsPanel.ModifyFailed'));
namespace.commitChangeBtnDisabled = false;
return false;
}
);
namespace.commited = true;
}
function syntaxCheck(namespace) {
var model = {
configText: namespace.editText,
namespaceId: namespace.baseInfo.id,
format: namespace.format
};
ConfigService.syntax_check_text(scope.appId,
scope.env,
scope.cluster,
namespace.baseInfo.namespaceName,
model).then(
function (result) {
toastr.success($translate.instant('ApolloNsPanel.GrammarIsRight'));
}, function (result) {
EventManager.emit(EventManager.EventType.SYNTAX_CHECK_TEXT_FAILED, {
syntaxCheckMessage: AppUtil.pureErrorMsg(result)
});
}
);
}
function goToParentAppConfigPage(namespace) {
$window.location.href = AppUtil.prefixPath() + "/config.html?#/appid=" + namespace.parentAppId;
$window.location.reload();
}
function parseModel2Text(namespace) {
if (namespace.items.length == 0) {
namespace.itemCnt = 0;
return "";
}
//文件模式
if (!namespace.isPropertiesFormat) {
return parseNotPropertiesText(namespace);
} else {
return parsePropertiesText(namespace);
}
}
function parseNotPropertiesText(namespace) {
var text = namespace.items[0].item.value;
var lineNum = text.split("\n").length;
namespace.itemCnt = lineNum;
return text;
}
function parsePropertiesText(namespace) {
var result = "";
var itemCnt = 0;
namespace.items.forEach(function (item) {
//deleted key
if (!item.item.dataChangeLastModifiedBy) {
return;
}
if (item.item.key) {
//use string \n to display as new line
var itemValue = item.item.value.replace(/\n/g, "\\n");
result +=
item.item.key + " = " + itemValue + "\n";
} else {
result += item.item.comment + "\n";
}
itemCnt++;
});
namespace.itemCnt = itemCnt;
return result;
}
function toggleItemSearchInput(namespace) {
namespace.displayControl.showSearchInput = !namespace.displayControl.showSearchInput;
}
function searchItems(namespace) {
var searchKey = namespace.searchKey.toLowerCase();
var items = [];
namespace.items.forEach(function (item) {
var key = item.item.key;
if (key && key.toLowerCase().indexOf(searchKey) >= 0) {
items.push(item);
}
});
namespace.viewItems = items;
}
//normal release and gray release
function publish(namespace) {
if (!namespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
return;
} else if (namespace.lockOwner && scope.user == namespace.lockOwner) {
//can not publish if config modified by himself
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: namespace,
mergeAndPublish: false
});
return;
}
if (namespace.isBranch) {
namespace.mergeAndPublish = false;
}
EventManager.emit(EventManager.EventType.PUBLISH_NAMESPACE,
{
namespace: namespace
});
}
function mergeAndPublish(branch) {
var parentNamespace = branch.parentNamespace;
if (!parentNamespace.hasReleasePermission) {
AppUtil.showModal('#releaseNoPermissionDialog');
} else if (parentNamespace.itemModifiedCnt > 0) {
AppUtil.showModal('#mergeAndReleaseDenyDialog');
} else if (branch.lockOwner && scope.user == branch.lockOwner) {
EventManager.emit(EventManager.EventType.PUBLISH_DENY, {
namespace: branch,
mergeAndPublish: true
});
} else {
EventManager.emit(EventManager.EventType.MERGE_AND_PUBLISH_NAMESPACE, { branch: branch });
}
}
function rollback(namespace) {
EventManager.emit(EventManager.EventType.PRE_ROLLBACK_NAMESPACE, { namespace: namespace });
}
function deleteNamespace(namespace) {
EventManager.emit(EventManager.EventType.PRE_DELETE_NAMESPACE, { namespace: namespace });
}
//theme: https://github.com/ajaxorg/ace-builds/tree/ba3b91e04a5aa559d56ac70964f9054baa0f4caf/src-min
scope.aceConfig = {
$blockScrolling: Infinity,
showPrintMargin: false,
theme: 'eclipse',
mode: scope.namespace.format === 'yml' ? 'yaml' : (scope.namespace.format === 'txt' ? undefined : scope.namespace.format),
onLoad: function (_editor) {
_editor.$blockScrolling = Infinity;
_editor.setOptions({
fontSize: 13,
minLines: 10,
maxLines: 20
})
}
};
setTimeout(function () {
scope.namespace.show = true;
}, 70);
}
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultUserService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.defaultimpl;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserService;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultUserService implements UserService {
@Override
public List<UserInfo> searchUsers(String keyword, int offset, int limit) {
return Collections.singletonList(assembleDefaultUser());
}
@Override
public UserInfo findByUserId(String userId) {
if (userId.equals("apollo")) {
return assembleDefaultUser();
}
return null;
}
@Override
public List<UserInfo> findByUserIds(List<String> userIds) {
if (userIds.contains("apollo")) {
return Lists.newArrayList(assembleDefaultUser());
}
return null;
}
private UserInfo assembleDefaultUser() {
UserInfo defaultUser = new UserInfo();
defaultUser.setUserId("apollo");
defaultUser.setName("apollo");
defaultUser.setEmail("apollo@acme.com");
return defaultUser;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.defaultimpl;
import com.google.common.collect.Lists;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.spi.UserService;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultUserService implements UserService {
@Override
public List<UserInfo> searchUsers(String keyword, int offset, int limit) {
return Collections.singletonList(assembleDefaultUser());
}
@Override
public UserInfo findByUserId(String userId) {
if (userId.equals("apollo")) {
return assembleDefaultUser();
}
return null;
}
@Override
public List<UserInfo> findByUserIds(List<String> userIds) {
if (userIds.contains("apollo")) {
return Lists.newArrayList(assembleDefaultUser());
}
return null;
}
private UserInfo assembleDefaultUser() {
UserInfo defaultUser = new UserInfo();
defaultUser.setUserId("apollo");
defaultUser.setName("apollo");
defaultUser.setEmail("apollo@acme.com");
return defaultUser;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/EnableApolloConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
import org.springframework.core.Ordered;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to register Apollo property sources when using Java Config.
*
* <p>Configuration example with multiple namespaces:</p>
* <pre class="code">
* @Configuration
* @EnableApolloConfig({"someNamespace","anotherNamespace"})
* public class AppConfig {
*
* }
* </pre>
*
* <p>Configuration example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* // Please note that this placeholder could not be configured in Apollo as Apollo is not activated during this phase.
* @Configuration
* @EnableApolloConfig({"${redis.namespace:xxx}"})
* public class AppConfig {
*
* }
* </pre>
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Documented
@Import(ApolloConfigRegistrar.class)
public @interface EnableApolloConfig {
/**
* Apollo namespaces to inject configuration into Spring Property Sources.
*/
String[] value() default {ConfigConsts.NAMESPACE_APPLICATION};
/**
* The order of the apollo config, default is {@link Ordered#LOWEST_PRECEDENCE}, which is Integer.MAX_VALUE.
* If there are properties with the same name in different apollo configs, the apollo config with smaller order wins.
* @return
*/
int order() default Ordered.LOWEST_PRECEDENCE;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
import org.springframework.core.Ordered;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to register Apollo property sources when using Java Config.
*
* <p>Configuration example with multiple namespaces:</p>
* <pre class="code">
* @Configuration
* @EnableApolloConfig({"someNamespace","anotherNamespace"})
* public class AppConfig {
*
* }
* </pre>
*
* <p>Configuration example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* // Please note that this placeholder could not be configured in Apollo as Apollo is not activated during this phase.
* @Configuration
* @EnableApolloConfig({"${redis.namespace:xxx}"})
* public class AppConfig {
*
* }
* </pre>
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Documented
@Import(ApolloConfigRegistrar.class)
public @interface EnableApolloConfig {
/**
* Apollo namespaces to inject configuration into Spring Property Sources.
*/
String[] value() default {ConfigConsts.NAMESPACE_APPLICATION};
/**
* The order of the apollo config, default is {@link Ordered#LOWEST_PRECEDENCE}, which is Integer.MAX_VALUE.
* If there are properties with the same name in different apollo configs, the apollo config with smaller order wins.
* @return
*/
int order() default Ordered.LOWEST_PRECEDENCE;
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloJsonValue.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Use this annotation to inject json property from Apollo, support the same format as Spring @Value.
*
* <p>Usage example:</p>
* <pre class="code">
* // Inject the json property value for type SomeObject.
* // Suppose SomeObject has 2 properties, someString and someInt, then the possible config
* // in Apollo is someJsonPropertyKey={"someString":"someValue", "someInt":10}.
* @ApolloJsonValue("${someJsonPropertyKey:someDefaultValue}")
* private SomeObject someObject;
* </pre>
*
* Create by zhangzheng on 2018/3/6
*
* @see org.springframework.beans.factory.annotation.Value
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD})
@Documented
public @interface ApolloJsonValue {
/**
* The actual value expression: e.g. "${someJsonPropertyKey:someDefaultValue}".
*/
String value();
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* Use this annotation to inject json property from Apollo, support the same format as Spring @Value.
*
* <p>Usage example:</p>
* <pre class="code">
* // Inject the json property value for type SomeObject.
* // Suppose SomeObject has 2 properties, someString and someInt, then the possible config
* // in Apollo is someJsonPropertyKey={"someString":"someValue", "someInt":10}.
* @ApolloJsonValue("${someJsonPropertyKey:someDefaultValue}")
* private SomeObject someObject;
* </pre>
*
* Create by zhangzheng on 2018/3/6
*
* @see org.springframework.beans.factory.annotation.Value
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD})
@Documented
public @interface ApolloJsonValue {
/**
* The actual value expression: e.g. "${someJsonPropertyKey:someDefaultValue}".
*/
String value();
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/LocalFileConfigRepositoryTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
public class LocalFileConfigRepositoryTest {
private File someBaseDir;
private String someNamespace;
private ConfigRepository upstreamRepo;
private Properties someProperties;
private static String someAppId = "someApp";
private static String someCluster = "someCluster";
private String defaultKey;
private String defaultValue;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someBaseDir = new File("src/test/resources/config-cache");
someBaseDir.mkdir();
someNamespace = "someName";
someProperties = new Properties();
defaultKey = "defaultKey";
defaultValue = "defaultValue";
someProperties.setProperty(defaultKey, defaultValue);
someSourceType = ConfigSourceType.REMOTE;
upstreamRepo = mock(ConfigRepository.class);
when(upstreamRepo.getConfig()).thenReturn(someProperties);
when(upstreamRepo.getSourceType()).thenReturn(someSourceType);
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
PropertiesFactory propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someBaseDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
private String assembleLocalCacheFileName() {
return String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
.join(someAppId, someCluster, someNamespace));
}
@Test
public void testLoadConfigWithLocalFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue\nxxx\nyyy";
Properties someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
createLocalCachePropertyFile(someProperties);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(someValue, properties.getProperty(someKey));
assertEquals(ConfigSourceType.LOCAL, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithLocalFileAndFallbackRepo() throws Exception {
File file = new File(someBaseDir, assembleLocalCacheFileName());
String someValue = "someValue";
Files.write(defaultKey + "=" + someValue, file, Charsets.UTF_8);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(defaultValue, properties.getProperty(defaultKey));
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFile() throws Exception {
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
Properties result = localFileConfigRepository.getConfig();
assertEquals(
"LocalFileConfigRepository's properties should be the same as fallback repo's when there is no local cache",
result, someProperties);
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFileMultipleTimes() throws Exception {
LocalFileConfigRepository localRepo =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties someProperties = localRepo.getConfig();
LocalFileConfigRepository
anotherLocalRepoWithNoFallback =
new LocalFileConfigRepository(someNamespace);
anotherLocalRepoWithNoFallback.setLocalCacheDir(someBaseDir, true);
Properties anotherProperties = anotherLocalRepoWithNoFallback.getConfig();
assertEquals(
"LocalFileConfigRepository should persist local cache files and return that afterwards",
someProperties, anotherProperties);
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testOnRepositoryChange() throws Exception {
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
localFileConfigRepository.addChangeListener(someListener);
localFileConfigRepository.getConfig();
Properties anotherProperties = new Properties();
anotherProperties.put("anotherKey", "anotherValue");
ConfigSourceType anotherSourceType = ConfigSourceType.NONE;
when(upstreamRepo.getSourceType()).thenReturn(anotherSourceType);
localFileConfigRepository.onRepositoryChange(someNamespace, anotherProperties);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(anotherProperties, captor.getValue());
assertEquals(anotherSourceType, localFileConfigRepository.getSourceType());
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
}
private File createLocalCachePropertyFile(Properties properties) throws IOException {
File file = new File(someBaseDir, assembleLocalCacheFileName());
FileOutputStream in = null;
try {
in = new FileOutputStream(file);
properties.store(in, "Persisted by LocalFileConfigRepositoryTest");
} finally {
if (in != null) {
in.close();
}
}
return file;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Properties;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.google.common.base.Charsets;
import com.google.common.base.Joiner;
import com.google.common.io.Files;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
public class LocalFileConfigRepositoryTest {
private File someBaseDir;
private String someNamespace;
private ConfigRepository upstreamRepo;
private Properties someProperties;
private static String someAppId = "someApp";
private static String someCluster = "someCluster";
private String defaultKey;
private String defaultValue;
private ConfigSourceType someSourceType;
@Before
public void setUp() throws Exception {
someBaseDir = new File("src/test/resources/config-cache");
someBaseDir.mkdir();
someNamespace = "someName";
someProperties = new Properties();
defaultKey = "defaultKey";
defaultValue = "defaultValue";
someProperties.setProperty(defaultKey, defaultValue);
someSourceType = ConfigSourceType.REMOTE;
upstreamRepo = mock(ConfigRepository.class);
when(upstreamRepo.getConfig()).thenReturn(someProperties);
when(upstreamRepo.getSourceType()).thenReturn(someSourceType);
MockInjector.setInstance(ConfigUtil.class, new MockConfigUtil());
PropertiesFactory propertiesFactory = mock(PropertiesFactory.class);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
recursiveDelete(someBaseDir);
}
//helper method to clean created files
private void recursiveDelete(File file) {
if (!file.exists()) {
return;
}
if (file.isDirectory()) {
for (File f : file.listFiles()) {
recursiveDelete(f);
}
}
file.delete();
}
private String assembleLocalCacheFileName() {
return String.format("%s.properties", Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR)
.join(someAppId, someCluster, someNamespace));
}
@Test
public void testLoadConfigWithLocalFile() throws Exception {
String someKey = "someKey";
String someValue = "someValue\nxxx\nyyy";
Properties someProperties = new Properties();
someProperties.setProperty(someKey, someValue);
createLocalCachePropertyFile(someProperties);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(someValue, properties.getProperty(someKey));
assertEquals(ConfigSourceType.LOCAL, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithLocalFileAndFallbackRepo() throws Exception {
File file = new File(someBaseDir, assembleLocalCacheFileName());
String someValue = "someValue";
Files.write(defaultKey + "=" + someValue, file, Charsets.UTF_8);
LocalFileConfigRepository localRepo = new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties properties = localRepo.getConfig();
assertEquals(defaultValue, properties.getProperty(defaultKey));
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFile() throws Exception {
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
Properties result = localFileConfigRepository.getConfig();
assertEquals(
"LocalFileConfigRepository's properties should be the same as fallback repo's when there is no local cache",
result, someProperties);
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
}
@Test
public void testLoadConfigWithNoLocalFileMultipleTimes() throws Exception {
LocalFileConfigRepository localRepo =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
localRepo.setLocalCacheDir(someBaseDir, true);
Properties someProperties = localRepo.getConfig();
LocalFileConfigRepository
anotherLocalRepoWithNoFallback =
new LocalFileConfigRepository(someNamespace);
anotherLocalRepoWithNoFallback.setLocalCacheDir(someBaseDir, true);
Properties anotherProperties = anotherLocalRepoWithNoFallback.getConfig();
assertEquals(
"LocalFileConfigRepository should persist local cache files and return that afterwards",
someProperties, anotherProperties);
assertEquals(someSourceType, localRepo.getSourceType());
}
@Test
public void testOnRepositoryChange() throws Exception {
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
LocalFileConfigRepository localFileConfigRepository =
new LocalFileConfigRepository(someNamespace, upstreamRepo);
assertEquals(someSourceType, localFileConfigRepository.getSourceType());
localFileConfigRepository.setLocalCacheDir(someBaseDir, true);
localFileConfigRepository.addChangeListener(someListener);
localFileConfigRepository.getConfig();
Properties anotherProperties = new Properties();
anotherProperties.put("anotherKey", "anotherValue");
ConfigSourceType anotherSourceType = ConfigSourceType.NONE;
when(upstreamRepo.getSourceType()).thenReturn(anotherSourceType);
localFileConfigRepository.onRepositoryChange(someNamespace, anotherProperties);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(anotherProperties, captor.getValue());
assertEquals(anotherSourceType, localFileConfigRepository.getSourceType());
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
}
private File createLocalCachePropertyFile(Properties properties) throws IOException {
File file = new File(someBaseDir, assembleLocalCacheFileName());
FileOutputStream in = null;
try {
in = new FileOutputStream(file);
properties.store(in, "Persisted by LocalFileConfigRepositoryTest");
} finally {
if (in != null) {
in.close();
}
}
return file;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/ConfigServiceApplication.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.annotation.PropertySource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* Spring boot application entry point
*
* @author Jason Song(song_s@ctrip.com)
*/
@EnableAspectJAutoProxy
@EnableAutoConfiguration
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(ConfigServiceApplication.class, args);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice;
import com.ctrip.framework.apollo.biz.ApolloBizConfig;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import com.ctrip.framework.apollo.metaservice.ApolloMetaServiceConfig;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.context.annotation.PropertySource;
import org.springframework.transaction.annotation.EnableTransactionManagement;
/**
* Spring boot application entry point
*
* @author Jason Song(song_s@ctrip.com)
*/
@EnableAspectJAutoProxy
@EnableAutoConfiguration
@Configuration
@EnableTransactionManagement
@PropertySource(value = {"classpath:configservice.properties"})
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class,
ApolloBizConfig.class,
ConfigServiceApplication.class,
ApolloMetaServiceConfig.class})
public class ConfigServiceApplication {
public static void main(String[] args) throws Exception {
SpringApplication.run(ConfigServiceApplication.class, args);
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/utils/DeprecatedPropertyNotifyUtil.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import org.slf4j.Logger;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class DeprecatedPropertyNotifyUtil {
private static final Logger log = DeferredLoggerFactory
.getLogger(DeprecatedPropertyNotifyUtil.class);
public static void warn(String deprecatedProperty, String insteadProperty) {
log.warn("[{}] is deprecated since 1.9.0 and will be removed in a future version, please use the [{}] instead.", deprecatedProperty, insteadProperty);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import org.slf4j.Logger;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class DeprecatedPropertyNotifyUtil {
private static final Logger log = DeferredLoggerFactory
.getLogger(DeprecatedPropertyNotifyUtil.class);
public static void warn(String deprecatedProperty, String insteadProperty) {
log.warn("[{}] is deprecated since 1.9.0 and will be removed in a future version, please use the [{}] instead.", deprecatedProperty, insteadProperty);
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/PageDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import org.springframework.data.domain.Pageable;
import java.util.Collections;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class PageDTO<T> {
private final long total;
private final List<T> content;
private final int page;
private final int size;
public PageDTO(List<T> content, Pageable pageable, long total) {
this.total = total;
this.content = content;
this.page = pageable.getPageNumber();
this.size = pageable.getPageSize();
}
public long getTotal() {
return total;
}
public List<T> getContent() {
return Collections.unmodifiableList(content);
}
public int getPage() {
return page;
}
public int getSize() {
return size;
}
public boolean hasContent(){
return content != null && content.size() > 0;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import org.springframework.data.domain.Pageable;
import java.util.Collections;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class PageDTO<T> {
private final long total;
private final List<T> content;
private final int page;
private final int size;
public PageDTO(List<T> content, Pageable pageable, long total) {
this.total = total;
this.content = content;
this.page = pageable.getPageNumber();
this.size = pageable.getPageSize();
}
public long getTotal() {
return total;
}
public List<T> getContent() {
return Collections.unmodifiableList(content);
}
public int getPage() {
return page;
}
public int getSize() {
return size;
}
public boolean hasContent(){
return content != null && content.size() > 0;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/directive/delete-namespace-modal-directive.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
directive_module.directive('deletenamespacemodal', deleteNamespaceModalDirective);
function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil, EventManager,
PermissionService, UserService, NamespaceService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/delete-namespace-modal.html',
transclude: true,
replace: true,
scope: {
env: '='
},
link: function (scope) {
scope.doDeleteNamespace = doDeleteNamespace;
EventManager.subscribe(EventManager.EventType.PRE_DELETE_NAMESPACE, function (context) {
var toDeleteNamespace = context.namespace;
scope.toDeleteNamespace = toDeleteNamespace;
//1. check operator has master permission
checkPermission(toDeleteNamespace).then(function () {
//2. check namespace's master branch has not instances
if (!checkMasterInstance(toDeleteNamespace)) {
return;
}
//3. check namespace's gray branch has not instances
if (!checkBranchInstance(toDeleteNamespace)) {
return;
}
if (!toDeleteNamespace.isPublic || toDeleteNamespace.isLinkedNamespace) {
showDeleteNamespaceConfirmDialog();
} else {
//5. check public namespace has not associated namespace
checkPublicNamespace(toDeleteNamespace).then(function () {
showDeleteNamespaceConfirmDialog();
});
}
})
});
function checkPermission(namespace) {
var d = $q.defer();
UserService.load_user().then(function (currentUser) {
var isAppMasterUser = false;
PermissionService.get_app_role_users(namespace.baseInfo.appId)
.then(function (appRoleUsers) {
var masterUsers = [];
appRoleUsers.masterUsers.forEach(function (user) {
masterUsers.push(_.escape(user.userId));
if (currentUser.userId == user.userId) {
isAppMasterUser = true;
}
});
scope.masterUsers = masterUsers;
scope.isAppMasterUser = isAppMasterUser;
if (!isAppMasterUser) {
toastr.error($translate.instant('Config.DeleteNamespaceNoPermissionFailedTips', {
users: scope.masterUsers.join(", ")
}), $translate.instant('Config.DeleteNamespaceNoPermissionFailedTitle'));
d.reject();
} else {
d.resolve();
}
});
});
return d.promise;
}
function checkMasterInstance(namespace) {
if (namespace.instancesCount > 0) {
EventManager.emit(EventManager.EventType.DELETE_NAMESPACE_FAILED, {
namespace: namespace,
reason: 'master_instance'
});
return false;
}
return true;
}
function checkBranchInstance(namespace) {
if (namespace.hasBranch && namespace.branch.latestReleaseInstances.total > 0) {
EventManager.emit(EventManager.EventType.DELETE_NAMESPACE_FAILED, {
namespace: namespace,
reason: 'branch_instance'
});
return false;
}
return true;
}
function checkPublicNamespace(namespace) {
var d = $q.defer();
var publicAppId = namespace.baseInfo.appId;
NamespaceService.getPublicAppNamespaceAllNamespaces(scope.env,
namespace.baseInfo.namespaceName,
0, 20)
.then(function (associatedNamespaces) {
var otherAppAssociatedNamespaces = [];
associatedNamespaces.forEach(function (associatedNamespace) {
if (associatedNamespace.appId != publicAppId) {
otherAppAssociatedNamespaces.push(associatedNamespace);
}
});
if (otherAppAssociatedNamespaces.length) {
EventManager.emit(EventManager.EventType.DELETE_NAMESPACE_FAILED, {
namespace: namespace,
reason: 'public_namespace',
otherAppAssociatedNamespaces: otherAppAssociatedNamespaces
});
d.reject();
} else {
d.resolve();
}
});
return d.promise;
}
function showDeleteNamespaceConfirmDialog() {
AppUtil.showModal('#deleteNamespaceModal');
}
function doDeleteNamespace() {
var toDeleteNamespace = scope.toDeleteNamespace;
NamespaceService.deleteNamespace(toDeleteNamespace.baseInfo.appId, scope.env,
toDeleteNamespace.baseInfo.clusterName,
toDeleteNamespace.baseInfo.namespaceName)
.then(function () {
toastr.success($translate.instant('Common.Deleted'));
setTimeout(function () {
$window.location.reload();
}, 1000);
}, function (result) {
AppUtil.showErrorMsg(result, $translate.instant('Common.DeleteFailed'));
})
}
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
directive_module.directive('deletenamespacemodal', deleteNamespaceModalDirective);
function deleteNamespaceModalDirective($window, $q, $translate, toastr, AppUtil, EventManager,
PermissionService, UserService, NamespaceService) {
return {
restrict: 'E',
templateUrl: AppUtil.prefixPath() + '/views/component/delete-namespace-modal.html',
transclude: true,
replace: true,
scope: {
env: '='
},
link: function (scope) {
scope.doDeleteNamespace = doDeleteNamespace;
EventManager.subscribe(EventManager.EventType.PRE_DELETE_NAMESPACE, function (context) {
var toDeleteNamespace = context.namespace;
scope.toDeleteNamespace = toDeleteNamespace;
//1. check operator has master permission
checkPermission(toDeleteNamespace).then(function () {
//2. check namespace's master branch has not instances
if (!checkMasterInstance(toDeleteNamespace)) {
return;
}
//3. check namespace's gray branch has not instances
if (!checkBranchInstance(toDeleteNamespace)) {
return;
}
if (!toDeleteNamespace.isPublic || toDeleteNamespace.isLinkedNamespace) {
showDeleteNamespaceConfirmDialog();
} else {
//5. check public namespace has not associated namespace
checkPublicNamespace(toDeleteNamespace).then(function () {
showDeleteNamespaceConfirmDialog();
});
}
})
});
function checkPermission(namespace) {
var d = $q.defer();
UserService.load_user().then(function (currentUser) {
var isAppMasterUser = false;
PermissionService.get_app_role_users(namespace.baseInfo.appId)
.then(function (appRoleUsers) {
var masterUsers = [];
appRoleUsers.masterUsers.forEach(function (user) {
masterUsers.push(_.escape(user.userId));
if (currentUser.userId == user.userId) {
isAppMasterUser = true;
}
});
scope.masterUsers = masterUsers;
scope.isAppMasterUser = isAppMasterUser;
if (!isAppMasterUser) {
toastr.error($translate.instant('Config.DeleteNamespaceNoPermissionFailedTips', {
users: scope.masterUsers.join(", ")
}), $translate.instant('Config.DeleteNamespaceNoPermissionFailedTitle'));
d.reject();
} else {
d.resolve();
}
});
});
return d.promise;
}
function checkMasterInstance(namespace) {
if (namespace.instancesCount > 0) {
EventManager.emit(EventManager.EventType.DELETE_NAMESPACE_FAILED, {
namespace: namespace,
reason: 'master_instance'
});
return false;
}
return true;
}
function checkBranchInstance(namespace) {
if (namespace.hasBranch && namespace.branch.latestReleaseInstances.total > 0) {
EventManager.emit(EventManager.EventType.DELETE_NAMESPACE_FAILED, {
namespace: namespace,
reason: 'branch_instance'
});
return false;
}
return true;
}
function checkPublicNamespace(namespace) {
var d = $q.defer();
var publicAppId = namespace.baseInfo.appId;
NamespaceService.getPublicAppNamespaceAllNamespaces(scope.env,
namespace.baseInfo.namespaceName,
0, 20)
.then(function (associatedNamespaces) {
var otherAppAssociatedNamespaces = [];
associatedNamespaces.forEach(function (associatedNamespace) {
if (associatedNamespace.appId != publicAppId) {
otherAppAssociatedNamespaces.push(associatedNamespace);
}
});
if (otherAppAssociatedNamespaces.length) {
EventManager.emit(EventManager.EventType.DELETE_NAMESPACE_FAILED, {
namespace: namespace,
reason: 'public_namespace',
otherAppAssociatedNamespaces: otherAppAssociatedNamespaces
});
d.reject();
} else {
d.resolve();
}
});
return d.promise;
}
function showDeleteNamespaceConfirmDialog() {
AppUtil.showModal('#deleteNamespaceModal');
}
function doDeleteNamespace() {
var toDeleteNamespace = scope.toDeleteNamespace;
NamespaceService.deleteNamespace(toDeleteNamespace.baseInfo.appId, scope.env,
toDeleteNamespace.baseInfo.clusterName,
toDeleteNamespace.baseInfo.namespaceName)
.then(function () {
toastr.success($translate.instant('Common.Deleted'));
setTimeout(function () {
$window.location.reload();
}, 1000);
}, function (result) {
AppUtil.showErrorMsg(result, $translate.instant('Common.DeleteFailed'));
})
}
}
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/ControllerIntegrationExceptionTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.client.HttpStatusCodeException;
import java.util.Map;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
public class ControllerIntegrationExceptionTest extends AbstractControllerTest {
@Autowired
AppController appController;
@Mock
AdminService adminService;
private Object realAdminService;
@Autowired
AppService appService;
private static final Gson GSON = new Gson();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
realAdminService = ReflectionTestUtils.getField(appController, "adminService");
ReflectionTestUtils.setField(appController, "adminService", adminService);
}
@After
public void tearDown() throws Exception {
ReflectionTestUtils.setField(appController, "adminService", realAdminService);
}
private String getBaseAppUrl() {
return "http://localhost:" + port + "/apps/";
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateFailed() {
AppDTO dto = generateSampleDTOData();
when(adminService.createNewApp(any(App.class))).thenThrow(new RuntimeException("save failed"));
try {
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
} catch (HttpStatusCodeException e) {
@SuppressWarnings("unchecked")
Map<String, String> attr = GSON.fromJson(e.getResponseBodyAsString(), Map.class);
Assert.assertEquals("save failed", attr.get("message"));
}
App savedApp = appService.findOne(dto.getAppId());
Assert.assertNull(savedApp);
}
private AppDTO generateSampleDTOData() {
AppDTO dto = new AppDTO();
dto.setAppId("someAppId");
dto.setName("someName");
dto.setOwnerName("someOwner");
dto.setOwnerEmail("someOwner@ctrip.com");
return dto;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.biz.service.AdminService;
import com.ctrip.framework.apollo.biz.service.AppService;
import com.ctrip.framework.apollo.common.dto.AppDTO;
import com.ctrip.framework.apollo.common.entity.App;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.jdbc.Sql;
import org.springframework.test.context.jdbc.Sql.ExecutionPhase;
import org.springframework.test.util.ReflectionTestUtils;
import org.springframework.web.client.HttpStatusCodeException;
import java.util.Map;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
public class ControllerIntegrationExceptionTest extends AbstractControllerTest {
@Autowired
AppController appController;
@Mock
AdminService adminService;
private Object realAdminService;
@Autowired
AppService appService;
private static final Gson GSON = new Gson();
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
realAdminService = ReflectionTestUtils.getField(appController, "adminService");
ReflectionTestUtils.setField(appController, "adminService", adminService);
}
@After
public void tearDown() throws Exception {
ReflectionTestUtils.setField(appController, "adminService", realAdminService);
}
private String getBaseAppUrl() {
return "http://localhost:" + port + "/apps/";
}
@Test
@Sql(scripts = "/controller/cleanup.sql", executionPhase = ExecutionPhase.AFTER_TEST_METHOD)
public void testCreateFailed() {
AppDTO dto = generateSampleDTOData();
when(adminService.createNewApp(any(App.class))).thenThrow(new RuntimeException("save failed"));
try {
restTemplate.postForEntity(getBaseAppUrl(), dto, AppDTO.class);
} catch (HttpStatusCodeException e) {
@SuppressWarnings("unchecked")
Map<String, String> attr = GSON.fromJson(e.getResponseBodyAsString(), Map.class);
Assert.assertEquals("save failed", attr.get("message"));
}
App savedApp = appService.findOne(dto.getAppId());
Assert.assertNull(savedApp);
}
private AppDTO generateSampleDTOData() {
AppDTO dto = new AppDTO();
dto.setAppId("someAppId");
dto.setName("someName");
dto.setOwnerName("someOwner");
dto.setOwnerEmail("someOwner@ctrip.com");
return dto;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AccessKeyRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import java.util.Date;
import java.util.List;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface AccessKeyRepository extends PagingAndSortingRepository<AccessKey, Long> {
long countByAppId(String appId);
AccessKey findOneByAppIdAndId(String appId, long id);
List<AccessKey> findByAppId(String appId);
List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(Date date);
List<AccessKey> findByDataChangeLastModifiedTime(Date date);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import java.util.Date;
import java.util.List;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface AccessKeyRepository extends PagingAndSortingRepository<AccessKey, Long> {
long countByAppId(String appId);
AccessKey findOneByAppIdAndId(String appId, long id);
List<AccessKey> findByAppId(String appId);
List<AccessKey> findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(Date date);
List<AccessKey> findByDataChangeLastModifiedTime(Date date);
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/views/component/namespace-panel-header.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<header class="row namespace-attribute-panel">
<div class="row">
<div class="col-md-6" style="padding-bottom:5px;">
<span class="text-center namespace-attribute-public label label-primary no-radius">
<span data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Header.Title.PrivateTips' | translate:this }}"
ng-show="!namespace.isPublic">{{'Component.Namespace.Header.Title.Private' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.PublicTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.parentAppId == namespace.baseInfo.appId">{{'Component.Namespace.Header.Title.Public' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.ExtendTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.isLinkedNamespace"
ng-click="goToParentAppConfigPage(namespace)">{{'Component.Namespace.Header.Title.Extend' | translate }}</span>
</span>
<span class="text-center namespace-attribute-public label label-info no-radius">
<span ng-bind="namespace.format" style="width:30px;"></span>
</span>
</div>
<div class="col-md-6 text-right" style="padding-right:23px;">
<span data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false">
<span class="label no-radius cursor-pointer" data-toggle="collapse" data-target="#BODY{{namespace.id}}"
aria-expanded="false" ng-click="showNamespaceBody = !showNamespaceBody"
ng-show="namespace.initialized">
<a>{{'Component.Namespace.Header.Title.ExpandAndCollapse' | translate }}</a>
</span>
</span>
</div>
</div>
</header>
<!--branch nav-->
<header class="panel-heading second-panel-heading" ng-show="namespace.initialized && namespace.hasBranch">
<div class="row">
<div class="col-md-8 pull-left">
<ul class="nav nav-tabs">
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch == 'master'}"
ng-click="switchBranch('master', true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Master' | translate }}
</a>
</li>
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch != 'master'}"
ng-click="switchBranch(namespace.branchName, true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Grayscale' | translate }}
</a>
</li>
</ul>
</div>
</div>
</header> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<header class="row namespace-attribute-panel">
<div class="row">
<div class="col-md-6" style="padding-bottom:5px;">
<span class="text-center namespace-attribute-public label label-primary no-radius">
<span data-tooltip="tooltip" data-placement="bottom"
title="{{'Component.Namespace.Header.Title.PrivateTips' | translate:this }}"
ng-show="!namespace.isPublic">{{'Component.Namespace.Header.Title.Private' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.PublicTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.parentAppId == namespace.baseInfo.appId">{{'Component.Namespace.Header.Title.Public' | translate }}</span>
<span data-tooltip="tooltip" data-placement="top"
title="{{'Component.Namespace.Header.Title.ExtendTips' | translate:this }}"
ng-show="namespace.isPublic && namespace.isLinkedNamespace"
ng-click="goToParentAppConfigPage(namespace)">{{'Component.Namespace.Header.Title.Extend' | translate }}</span>
</span>
<span class="text-center namespace-attribute-public label label-info no-radius">
<span ng-bind="namespace.format" style="width:30px;"></span>
</span>
</div>
<div class="col-md-6 text-right" style="padding-right:23px;">
<span data-toggle="collapse" data-target="#BODY{{namespace.branch.id}}" aria-expanded="false">
<span class="label no-radius cursor-pointer" data-toggle="collapse" data-target="#BODY{{namespace.id}}"
aria-expanded="false" ng-click="showNamespaceBody = !showNamespaceBody"
ng-show="namespace.initialized">
<a>{{'Component.Namespace.Header.Title.ExpandAndCollapse' | translate }}</a>
</span>
</span>
</div>
</div>
</header>
<!--branch nav-->
<header class="panel-heading second-panel-heading" ng-show="namespace.initialized && namespace.hasBranch">
<div class="row">
<div class="col-md-8 pull-left">
<ul class="nav nav-tabs">
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch == 'master'}"
ng-click="switchBranch('master', true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Master' | translate }}
</a>
</li>
<li role="presentation">
<a ng-class="{'node_active': namespace.displayControl.currentOperateBranch != 'master'}"
ng-click="switchBranch(namespace.branchName, true)">
<img src="img/branch.png">
{{'Component.Namespace.Header.Title.Grayscale' | translate }}
</a>
</li>
</ul>
</div>
</div>
</header> | -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/config/application-ldap-activedirectory-sample.yml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ldap sample for active directory, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "admin" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(sAMAccountName={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://1.1.1.1:389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "user" # ldap 用户 objectClass 配置
loginId: "sAMAccountName" # ldap 用户惟一 id，用来作为登录的 id
userDisplayName: "cn" # ldap 用户名，用来作为显示名
email: "userPrincipalName" # ldap 邮箱属性
# filter: # 可选项，配置过滤，目前只支持 memberOf
# memberOf: "CN=ServiceDEV,OU=test,DC=example,DC=com|CN=WebDEV,OU=test,DC=example,DC=com" # 只允许 memberOf 属性为 ServiceDEV 和 WebDEV 的用户访问
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# ldap sample for active directory, need to rename this file to application-ldap.yml to make it effective
spring:
ldap:
base: "dc=example,dc=com"
username: "admin" # 配置管理员账号，用于搜索、匹配用户
password: "password"
searchFilter: "(sAMAccountName={0})" # 用户过滤器，登录的时候用这个过滤器来搜索用户
urls:
- "ldap://1.1.1.1:389"
ldap:
mapping: # 配置 ldap 属性
objectClass: "user" # ldap 用户 objectClass 配置
loginId: "sAMAccountName" # ldap 用户惟一 id，用来作为登录的 id
userDisplayName: "cn" # ldap 用户名，用来作为显示名
email: "userPrincipalName" # ldap 邮箱属性
# filter: # 可选项，配置过滤，目前只支持 memberOf
# memberOf: "CN=ServiceDEV,OU=test,DC=example,DC=com|CN=WebDEV,OU=test,DC=example,DC=com" # 只允许 memberOf 属性为 ServiceDEV 和 WebDEV 的用户访问
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/grayReleaseRule/GrayReleaseRulesHolder.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.grayReleaseRule;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.message.ReleaseMessageListener;
import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.framework.apollo.biz.repository.GrayReleaseRuleRepository;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.google.common.collect.TreeMultimap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRulesHolder implements ReleaseMessageListener, InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(GrayReleaseRulesHolder.class);
private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
private static final Splitter STRING_SPLITTER =
Splitter.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).omitEmptyStrings();
@Autowired
private GrayReleaseRuleRepository grayReleaseRuleRepository;
@Autowired
private BizConfig bizConfig;
private int databaseScanInterval;
private ScheduledExecutorService executorService;
//store configAppId+configCluster+configNamespace -> GrayReleaseRuleCache map
private Multimap<String, GrayReleaseRuleCache> grayReleaseRuleCache;
//store clientAppId+clientNamespace+ip -> ruleId map
private Multimap<String, Long> reversedGrayReleaseRuleCache;
//an auto increment version to indicate the age of rules
private AtomicLong loadVersion;
public GrayReleaseRulesHolder() {
loadVersion = new AtomicLong();
grayReleaseRuleCache = Multimaps.synchronizedSetMultimap(
TreeMultimap.create(String.CASE_INSENSITIVE_ORDER, Ordering.natural()));
reversedGrayReleaseRuleCache = Multimaps.synchronizedSetMultimap(
TreeMultimap.create(String.CASE_INSENSITIVE_ORDER, Ordering.natural()));
executorService = Executors.newScheduledThreadPool(1, ApolloThreadFactory
.create("GrayReleaseRulesHolder", true));
}
@Override
public void afterPropertiesSet() throws Exception {
populateDataBaseInterval();
//force sync load for the first time
periodicScanRules();
executorService.scheduleWithFixedDelay(this::periodicScanRules,
getDatabaseScanIntervalSecond(), getDatabaseScanIntervalSecond(), getDatabaseScanTimeUnit()
);
}
@Override
public void handleMessage(ReleaseMessage message, String channel) {
logger.info("message received - channel: {}, message: {}", channel, message);
String releaseMessage = message.getMessage();
if (!Topics.APOLLO_RELEASE_TOPIC.equals(channel) || Strings.isNullOrEmpty(releaseMessage)) {
return;
}
List<String> keys = STRING_SPLITTER.splitToList(releaseMessage);
//message should be appId+cluster+namespace
if (keys.size() != 3) {
logger.error("message format invalid - {}", releaseMessage);
return;
}
String appId = keys.get(0);
String cluster = keys.get(1);
String namespace = keys.get(2);
List<GrayReleaseRule> rules = grayReleaseRuleRepository
.findByAppIdAndClusterNameAndNamespaceName(appId, cluster, namespace);
mergeGrayReleaseRules(rules);
}
private void periodicScanRules() {
Transaction transaction = Tracer.newTransaction("Apollo.GrayReleaseRulesScanner",
"scanGrayReleaseRules");
try {
loadVersion.incrementAndGet();
scanGrayReleaseRules();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Scan gray release rule failed", ex);
} finally {
transaction.complete();
}
}
public Long findReleaseIdFromGrayReleaseRule(String clientAppId, String clientIp, String
configAppId, String configCluster, String configNamespaceName) {
String key = assembleGrayReleaseRuleKey(configAppId, configCluster, configNamespaceName);
if (!grayReleaseRuleCache.containsKey(key)) {
return null;
}
//create a new list to avoid ConcurrentModificationException
List<GrayReleaseRuleCache> rules = Lists.newArrayList(grayReleaseRuleCache.get(key));
for (GrayReleaseRuleCache rule : rules) {
//check branch status
if (rule.getBranchStatus() != NamespaceBranchStatus.ACTIVE) {
continue;
}
if (rule.matches(clientAppId, clientIp)) {
return rule.getReleaseId();
}
}
return null;
}
/**
* Check whether there are gray release rules for the clientAppId, clientIp, namespace
* combination. Please note that even there are gray release rules, it doesn't mean it will always
* load gray releases. Because gray release rules actually apply to one more dimension - cluster.
*/
public boolean hasGrayReleaseRule(String clientAppId, String clientIp, String namespaceName) {
return reversedGrayReleaseRuleCache.containsKey(assembleReversedGrayReleaseRuleKey(clientAppId,
namespaceName, clientIp)) || reversedGrayReleaseRuleCache.containsKey
(assembleReversedGrayReleaseRuleKey(clientAppId, namespaceName, GrayReleaseRuleItemDTO
.ALL_IP));
}
private void scanGrayReleaseRules() {
long maxIdScanned = 0;
boolean hasMore = true;
while (hasMore && !Thread.currentThread().isInterrupted()) {
List<GrayReleaseRule> grayReleaseRules = grayReleaseRuleRepository
.findFirst500ByIdGreaterThanOrderByIdAsc(maxIdScanned);
if (CollectionUtils.isEmpty(grayReleaseRules)) {
break;
}
mergeGrayReleaseRules(grayReleaseRules);
int rulesScanned = grayReleaseRules.size();
maxIdScanned = grayReleaseRules.get(rulesScanned - 1).getId();
//batch is 500
hasMore = rulesScanned == 500;
}
}
private void mergeGrayReleaseRules(List<GrayReleaseRule> grayReleaseRules) {
if (CollectionUtils.isEmpty(grayReleaseRules)) {
return;
}
for (GrayReleaseRule grayReleaseRule : grayReleaseRules) {
if (grayReleaseRule.getReleaseId() == null || grayReleaseRule.getReleaseId() == 0) {
//filter rules with no release id, i.e. never released
continue;
}
String key = assembleGrayReleaseRuleKey(grayReleaseRule.getAppId(), grayReleaseRule
.getClusterName(), grayReleaseRule.getNamespaceName());
//create a new list to avoid ConcurrentModificationException
List<GrayReleaseRuleCache> rules = Lists.newArrayList(grayReleaseRuleCache.get(key));
GrayReleaseRuleCache oldRule = null;
for (GrayReleaseRuleCache ruleCache : rules) {
if (ruleCache.getBranchName().equals(grayReleaseRule.getBranchName())) {
oldRule = ruleCache;
break;
}
}
//if old rule is null and new rule's branch status is not active, ignore
if (oldRule == null && grayReleaseRule.getBranchStatus() != NamespaceBranchStatus.ACTIVE) {
continue;
}
//use id comparison to avoid synchronization
if (oldRule == null || grayReleaseRule.getId() > oldRule.getRuleId()) {
addCache(key, transformRuleToRuleCache(grayReleaseRule));
if (oldRule != null) {
removeCache(key, oldRule);
}
} else {
if (oldRule.getBranchStatus() == NamespaceBranchStatus.ACTIVE) {
//update load version
oldRule.setLoadVersion(loadVersion.get());
} else if ((loadVersion.get() - oldRule.getLoadVersion()) > 1) {
//remove outdated inactive branch rule after 2 update cycles
removeCache(key, oldRule);
}
}
}
}
private void addCache(String key, GrayReleaseRuleCache ruleCache) {
if (ruleCache.getBranchStatus() == NamespaceBranchStatus.ACTIVE) {
for (GrayReleaseRuleItemDTO ruleItemDTO : ruleCache.getRuleItems()) {
for (String clientIp : ruleItemDTO.getClientIpList()) {
reversedGrayReleaseRuleCache.put(assembleReversedGrayReleaseRuleKey(ruleItemDTO
.getClientAppId(), ruleCache.getNamespaceName(), clientIp), ruleCache.getRuleId());
}
}
}
grayReleaseRuleCache.put(key, ruleCache);
}
private void removeCache(String key, GrayReleaseRuleCache ruleCache) {
grayReleaseRuleCache.remove(key, ruleCache);
for (GrayReleaseRuleItemDTO ruleItemDTO : ruleCache.getRuleItems()) {
for (String clientIp : ruleItemDTO.getClientIpList()) {
reversedGrayReleaseRuleCache.remove(assembleReversedGrayReleaseRuleKey(ruleItemDTO
.getClientAppId(), ruleCache.getNamespaceName(), clientIp), ruleCache.getRuleId());
}
}
}
private GrayReleaseRuleCache transformRuleToRuleCache(GrayReleaseRule grayReleaseRule) {
Set<GrayReleaseRuleItemDTO> ruleItems;
try {
ruleItems = GrayReleaseRuleItemTransformer.batchTransformFromJSON(grayReleaseRule.getRules());
} catch (Throwable ex) {
ruleItems = Sets.newHashSet();
Tracer.logError(ex);
logger.error("parse rule for gray release rule {} failed", grayReleaseRule.getId(), ex);
}
GrayReleaseRuleCache ruleCache = new GrayReleaseRuleCache(grayReleaseRule.getId(),
grayReleaseRule.getBranchName(), grayReleaseRule.getNamespaceName(), grayReleaseRule
.getReleaseId(), grayReleaseRule.getBranchStatus(), loadVersion.get(), ruleItems);
return ruleCache;
}
private void populateDataBaseInterval() {
databaseScanInterval = bizConfig.grayReleaseRuleScanInterval();
}
private int getDatabaseScanIntervalSecond() {
return databaseScanInterval;
}
private TimeUnit getDatabaseScanTimeUnit() {
return TimeUnit.SECONDS;
}
private String assembleGrayReleaseRuleKey(String configAppId, String configCluster, String
configNamespaceName) {
return STRING_JOINER.join(configAppId, configCluster, configNamespaceName);
}
private String assembleReversedGrayReleaseRuleKey(String clientAppId, String
clientNamespaceName, String clientIp) {
return STRING_JOINER.join(clientAppId, clientNamespaceName, clientIp);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.grayReleaseRule;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Ordering;
import com.google.common.collect.Sets;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.GrayReleaseRule;
import com.ctrip.framework.apollo.biz.entity.ReleaseMessage;
import com.ctrip.framework.apollo.biz.message.ReleaseMessageListener;
import com.ctrip.framework.apollo.biz.message.Topics;
import com.ctrip.framework.apollo.biz.repository.GrayReleaseRuleRepository;
import com.ctrip.framework.apollo.common.constants.NamespaceBranchStatus;
import com.ctrip.framework.apollo.common.dto.GrayReleaseRuleItemDTO;
import com.ctrip.framework.apollo.common.utils.GrayReleaseRuleItemTransformer;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.google.common.collect.TreeMultimap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import java.util.List;
import java.util.Set;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class GrayReleaseRulesHolder implements ReleaseMessageListener, InitializingBean {
private static final Logger logger = LoggerFactory.getLogger(GrayReleaseRulesHolder.class);
private static final Joiner STRING_JOINER = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR);
private static final Splitter STRING_SPLITTER =
Splitter.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).omitEmptyStrings();
@Autowired
private GrayReleaseRuleRepository grayReleaseRuleRepository;
@Autowired
private BizConfig bizConfig;
private int databaseScanInterval;
private ScheduledExecutorService executorService;
//store configAppId+configCluster+configNamespace -> GrayReleaseRuleCache map
private Multimap<String, GrayReleaseRuleCache> grayReleaseRuleCache;
//store clientAppId+clientNamespace+ip -> ruleId map
private Multimap<String, Long> reversedGrayReleaseRuleCache;
//an auto increment version to indicate the age of rules
private AtomicLong loadVersion;
public GrayReleaseRulesHolder() {
loadVersion = new AtomicLong();
grayReleaseRuleCache = Multimaps.synchronizedSetMultimap(
TreeMultimap.create(String.CASE_INSENSITIVE_ORDER, Ordering.natural()));
reversedGrayReleaseRuleCache = Multimaps.synchronizedSetMultimap(
TreeMultimap.create(String.CASE_INSENSITIVE_ORDER, Ordering.natural()));
executorService = Executors.newScheduledThreadPool(1, ApolloThreadFactory
.create("GrayReleaseRulesHolder", true));
}
@Override
public void afterPropertiesSet() throws Exception {
populateDataBaseInterval();
//force sync load for the first time
periodicScanRules();
executorService.scheduleWithFixedDelay(this::periodicScanRules,
getDatabaseScanIntervalSecond(), getDatabaseScanIntervalSecond(), getDatabaseScanTimeUnit()
);
}
@Override
public void handleMessage(ReleaseMessage message, String channel) {
logger.info("message received - channel: {}, message: {}", channel, message);
String releaseMessage = message.getMessage();
if (!Topics.APOLLO_RELEASE_TOPIC.equals(channel) || Strings.isNullOrEmpty(releaseMessage)) {
return;
}
List<String> keys = STRING_SPLITTER.splitToList(releaseMessage);
//message should be appId+cluster+namespace
if (keys.size() != 3) {
logger.error("message format invalid - {}", releaseMessage);
return;
}
String appId = keys.get(0);
String cluster = keys.get(1);
String namespace = keys.get(2);
List<GrayReleaseRule> rules = grayReleaseRuleRepository
.findByAppIdAndClusterNameAndNamespaceName(appId, cluster, namespace);
mergeGrayReleaseRules(rules);
}
private void periodicScanRules() {
Transaction transaction = Tracer.newTransaction("Apollo.GrayReleaseRulesScanner",
"scanGrayReleaseRules");
try {
loadVersion.incrementAndGet();
scanGrayReleaseRules();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Scan gray release rule failed", ex);
} finally {
transaction.complete();
}
}
public Long findReleaseIdFromGrayReleaseRule(String clientAppId, String clientIp, String
configAppId, String configCluster, String configNamespaceName) {
String key = assembleGrayReleaseRuleKey(configAppId, configCluster, configNamespaceName);
if (!grayReleaseRuleCache.containsKey(key)) {
return null;
}
//create a new list to avoid ConcurrentModificationException
List<GrayReleaseRuleCache> rules = Lists.newArrayList(grayReleaseRuleCache.get(key));
for (GrayReleaseRuleCache rule : rules) {
//check branch status
if (rule.getBranchStatus() != NamespaceBranchStatus.ACTIVE) {
continue;
}
if (rule.matches(clientAppId, clientIp)) {
return rule.getReleaseId();
}
}
return null;
}
/**
* Check whether there are gray release rules for the clientAppId, clientIp, namespace
* combination. Please note that even there are gray release rules, it doesn't mean it will always
* load gray releases. Because gray release rules actually apply to one more dimension - cluster.
*/
public boolean hasGrayReleaseRule(String clientAppId, String clientIp, String namespaceName) {
return reversedGrayReleaseRuleCache.containsKey(assembleReversedGrayReleaseRuleKey(clientAppId,
namespaceName, clientIp)) || reversedGrayReleaseRuleCache.containsKey
(assembleReversedGrayReleaseRuleKey(clientAppId, namespaceName, GrayReleaseRuleItemDTO
.ALL_IP));
}
private void scanGrayReleaseRules() {
long maxIdScanned = 0;
boolean hasMore = true;
while (hasMore && !Thread.currentThread().isInterrupted()) {
List<GrayReleaseRule> grayReleaseRules = grayReleaseRuleRepository
.findFirst500ByIdGreaterThanOrderByIdAsc(maxIdScanned);
if (CollectionUtils.isEmpty(grayReleaseRules)) {
break;
}
mergeGrayReleaseRules(grayReleaseRules);
int rulesScanned = grayReleaseRules.size();
maxIdScanned = grayReleaseRules.get(rulesScanned - 1).getId();
//batch is 500
hasMore = rulesScanned == 500;
}
}
private void mergeGrayReleaseRules(List<GrayReleaseRule> grayReleaseRules) {
if (CollectionUtils.isEmpty(grayReleaseRules)) {
return;
}
for (GrayReleaseRule grayReleaseRule : grayReleaseRules) {
if (grayReleaseRule.getReleaseId() == null || grayReleaseRule.getReleaseId() == 0) {
//filter rules with no release id, i.e. never released
continue;
}
String key = assembleGrayReleaseRuleKey(grayReleaseRule.getAppId(), grayReleaseRule
.getClusterName(), grayReleaseRule.getNamespaceName());
//create a new list to avoid ConcurrentModificationException
List<GrayReleaseRuleCache> rules = Lists.newArrayList(grayReleaseRuleCache.get(key));
GrayReleaseRuleCache oldRule = null;
for (GrayReleaseRuleCache ruleCache : rules) {
if (ruleCache.getBranchName().equals(grayReleaseRule.getBranchName())) {
oldRule = ruleCache;
break;
}
}
//if old rule is null and new rule's branch status is not active, ignore
if (oldRule == null && grayReleaseRule.getBranchStatus() != NamespaceBranchStatus.ACTIVE) {
continue;
}
//use id comparison to avoid synchronization
if (oldRule == null || grayReleaseRule.getId() > oldRule.getRuleId()) {
addCache(key, transformRuleToRuleCache(grayReleaseRule));
if (oldRule != null) {
removeCache(key, oldRule);
}
} else {
if (oldRule.getBranchStatus() == NamespaceBranchStatus.ACTIVE) {
//update load version
oldRule.setLoadVersion(loadVersion.get());
} else if ((loadVersion.get() - oldRule.getLoadVersion()) > 1) {
//remove outdated inactive branch rule after 2 update cycles
removeCache(key, oldRule);
}
}
}
}
private void addCache(String key, GrayReleaseRuleCache ruleCache) {
if (ruleCache.getBranchStatus() == NamespaceBranchStatus.ACTIVE) {
for (GrayReleaseRuleItemDTO ruleItemDTO : ruleCache.getRuleItems()) {
for (String clientIp : ruleItemDTO.getClientIpList()) {
reversedGrayReleaseRuleCache.put(assembleReversedGrayReleaseRuleKey(ruleItemDTO
.getClientAppId(), ruleCache.getNamespaceName(), clientIp), ruleCache.getRuleId());
}
}
}
grayReleaseRuleCache.put(key, ruleCache);
}
private void removeCache(String key, GrayReleaseRuleCache ruleCache) {
grayReleaseRuleCache.remove(key, ruleCache);
for (GrayReleaseRuleItemDTO ruleItemDTO : ruleCache.getRuleItems()) {
for (String clientIp : ruleItemDTO.getClientIpList()) {
reversedGrayReleaseRuleCache.remove(assembleReversedGrayReleaseRuleKey(ruleItemDTO
.getClientAppId(), ruleCache.getNamespaceName(), clientIp), ruleCache.getRuleId());
}
}
}
private GrayReleaseRuleCache transformRuleToRuleCache(GrayReleaseRule grayReleaseRule) {
Set<GrayReleaseRuleItemDTO> ruleItems;
try {
ruleItems = GrayReleaseRuleItemTransformer.batchTransformFromJSON(grayReleaseRule.getRules());
} catch (Throwable ex) {
ruleItems = Sets.newHashSet();
Tracer.logError(ex);
logger.error("parse rule for gray release rule {} failed", grayReleaseRule.getId(), ex);
}
GrayReleaseRuleCache ruleCache = new GrayReleaseRuleCache(grayReleaseRule.getId(),
grayReleaseRule.getBranchName(), grayReleaseRule.getNamespaceName(), grayReleaseRule
.getReleaseId(), grayReleaseRule.getBranchStatus(), loadVersion.get(), ruleItems);
return ruleCache;
}
private void populateDataBaseInterval() {
databaseScanInterval = bizConfig.grayReleaseRuleScanInterval();
}
private int getDatabaseScanIntervalSecond() {
return databaseScanInterval;
}
private TimeUnit getDatabaseScanTimeUnit() {
return TimeUnit.SECONDS;
}
private String assembleGrayReleaseRuleKey(String configAppId, String configCluster, String
configNamespaceName) {
return STRING_JOINER.join(configAppId, configCluster, configNamespaceName);
}
private String assembleReversedGrayReleaseRuleKey(String clientAppId, String
clientNamespaceName, String clientIp) {
return STRING_JOINER.join(clientAppId, clientNamespaceName, clientIp);
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/listener/AppNamespaceDeletionEvent.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.listener;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.google.common.base.Preconditions;
import org.springframework.context.ApplicationEvent;
public class AppNamespaceDeletionEvent extends ApplicationEvent {
public AppNamespaceDeletionEvent(Object source) {
super(source);
}
public AppNamespace getAppNamespace() {
Preconditions.checkState(source != null);
return (AppNamespace) this.source;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.listener;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import com.google.common.base.Preconditions;
import org.springframework.context.ApplicationEvent;
public class AppNamespaceDeletionEvent extends ApplicationEvent {
public AppNamespaceDeletionEvent(Object source) {
super(source);
}
public AppNamespace getAppNamespace() {
Preconditions.checkState(source != null);
return (AppNamespace) this.source;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/vendor/valdr/valdr-message.min.js | !function(a,b){"use strict";angular.module("valdr").provider("valdrMessage",function(){var a,b,c={},d="valdr/default-message.html",e='<div class="valdr-message">{{ violation.message }}</div>',f='<div class="valdr-message" ng-show="violation"><span translate="{{ violation.message }}" translate-values="violation"></span></div>';this.setTemplate=function(a){b=a},this.setTemplateUrl=function(b){a=b},this.addMessages=function(a){angular.extend(c,a)};var g=this.addMessages;this.getMessage=function(a,b,d){var e=a+"."+b+"."+d;return c[e]||c[d]||"["+d+"]"};var h=this.getMessage;this.$get=["$templateCache","$injector",function(c,i){function j(){try{return i.get("$translate")}catch(a){return void 0}}function k(){try{return i.get("valdrFieldNameKeyGenerator")}catch(a){return function(a){return a.type+"."+a.field}}}function l(){return angular.isDefined(b)?b:p?f:e}function m(){c.put(d,l()),a&&b&&c.put(a,b)}var n=!1,o=j(),p=angular.isDefined(o),q=k();return m(),{templateUrl:a||d,setTemplate:function(a){b=a,m()},translateAvailable:p,$translate:o,fieldNameKeyGenerator:q,addMessages:g,getMessage:h,angularMessagesEnabled:n}}]});var c=function(a){return["$compile",function(b){return{restrict:a,require:["?^valdrType","?^ngModel","?^valdrFormGroup"],link:function(a,c,d,e){var f=e[0],g=e[1],h=e[2],i=d.valdrNoValidate,j=d.valdrNoMessage,k=d.name;if(f&&h&&g&&!angular.isDefined(i)&&!angular.isDefined(j)){var l=angular.element('<span valdr-message="'+k+'"></span>');b(l)(a),h.addMessageElement(g,l),a.$on("$destroy",function(){h.removeMessageElement(g)})}}}}]},d=c("E"),e=c("A"),f={getType:angular.noop};angular.module("valdr").directive("input",d).directive("select",d).directive("textarea",d).directive("enableValdrMessage",e).directive("valdrMessage",["$rootScope","$injector","valdrMessage","valdrUtil",function(a,b,c,d){return{replace:!0,restrict:"A",scope:{formFieldName:"@valdrMessage"},templateUrl:function(){return c.templateUrl},require:["^form","?^valdrType"],link:function(b,e,g,h){var i=h[0],j=h[1]||f,k=function(){c.translateAvailable&&angular.isArray(b.violations)&&angular.forEach(b.violations,function(a){c.$translate(c.fieldNameKeyGenerator(a)).then(function(b){a.fieldName=b})})},l=function(a){var d=j.getType(),e=b.formFieldName;return{type:d,field:e,validator:a,message:c.getMessage(d,e,a)}},m=function(){b.violations=[],angular.forEach(b.formField.valdrViolations,function(a){b.violations.push(a)}),c.angularMessagesEnabled&&angular.forEach(b.formField.$error,function(a,c){d.startsWith(c,"valdr")||b.violations.push(l(c))}),b.violation=b.violations[0],k()},n=function(){b.violations=void 0,b.violation=void 0},o=function(){return b.formField=i[b.formFieldName],b.formField?{valdr:b.formField.valdrViolations,error:b.formField.$error}:void 0};b.$watch(o,function(){b.formField&&b.formField.$invalid?m():n()},!0),a.$on("$translateChangeSuccess",function(){k()})}}}])}(window,document); | !function(a,b){"use strict";angular.module("valdr").provider("valdrMessage",function(){var a,b,c={},d="valdr/default-message.html",e='<div class="valdr-message">{{ violation.message }}</div>',f='<div class="valdr-message" ng-show="violation"><span translate="{{ violation.message }}" translate-values="violation"></span></div>';this.setTemplate=function(a){b=a},this.setTemplateUrl=function(b){a=b},this.addMessages=function(a){angular.extend(c,a)};var g=this.addMessages;this.getMessage=function(a,b,d){var e=a+"."+b+"."+d;return c[e]||c[d]||"["+d+"]"};var h=this.getMessage;this.$get=["$templateCache","$injector",function(c,i){function j(){try{return i.get("$translate")}catch(a){return void 0}}function k(){try{return i.get("valdrFieldNameKeyGenerator")}catch(a){return function(a){return a.type+"."+a.field}}}function l(){return angular.isDefined(b)?b:p?f:e}function m(){c.put(d,l()),a&&b&&c.put(a,b)}var n=!1,o=j(),p=angular.isDefined(o),q=k();return m(),{templateUrl:a||d,setTemplate:function(a){b=a,m()},translateAvailable:p,$translate:o,fieldNameKeyGenerator:q,addMessages:g,getMessage:h,angularMessagesEnabled:n}}]});var c=function(a){return["$compile",function(b){return{restrict:a,require:["?^valdrType","?^ngModel","?^valdrFormGroup"],link:function(a,c,d,e){var f=e[0],g=e[1],h=e[2],i=d.valdrNoValidate,j=d.valdrNoMessage,k=d.name;if(f&&h&&g&&!angular.isDefined(i)&&!angular.isDefined(j)){var l=angular.element('<span valdr-message="'+k+'"></span>');b(l)(a),h.addMessageElement(g,l),a.$on("$destroy",function(){h.removeMessageElement(g)})}}}}]},d=c("E"),e=c("A"),f={getType:angular.noop};angular.module("valdr").directive("input",d).directive("select",d).directive("textarea",d).directive("enableValdrMessage",e).directive("valdrMessage",["$rootScope","$injector","valdrMessage","valdrUtil",function(a,b,c,d){return{replace:!0,restrict:"A",scope:{formFieldName:"@valdrMessage"},templateUrl:function(){return c.templateUrl},require:["^form","?^valdrType"],link:function(b,e,g,h){var i=h[0],j=h[1]||f,k=function(){c.translateAvailable&&angular.isArray(b.violations)&&angular.forEach(b.violations,function(a){c.$translate(c.fieldNameKeyGenerator(a)).then(function(b){a.fieldName=b})})},l=function(a){var d=j.getType(),e=b.formFieldName;return{type:d,field:e,validator:a,message:c.getMessage(d,e,a)}},m=function(){b.violations=[],angular.forEach(b.formField.valdrViolations,function(a){b.violations.push(a)}),c.angularMessagesEnabled&&angular.forEach(b.formField.$error,function(a,c){d.startsWith(c,"valdr")||b.violations.push(l(c))}),b.violation=b.violations[0],k()},n=function(){b.violations=void 0,b.violation=void 0},o=function(){return b.formField=i[b.formFieldName],b.formField?{valdr:b.formField.valdrViolations,error:b.formField.$error}:void 0};b.$watch(o,function(){b.formField&&b.formField.$invalid?m():n()},!0),a.$on("$translateChangeSuccess",function(){k()})}}}])}(window,document); | -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AuditRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Audit;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner")
List<Audit> findByOwner(@Param("owner") String owner);
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner AND a.entityName =:entity AND a.opName = :op")
List<Audit> findAudits(@Param("owner") String owner, @Param("entity") String entity,
@Param("op") String op);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Audit;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
public interface AuditRepository extends PagingAndSortingRepository<Audit, Long> {
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner")
List<Audit> findByOwner(@Param("owner") String owner);
@Query("SELECT a from Audit a WHERE a.dataChangeCreatedBy = :owner AND a.entityName =:entity AND a.opName = :op")
List<Audit> findAudits(@Param("owner") String owner, @Param("entity") String entity,
@Param("op") String op);
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/MetaDomainConsts.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.NetUtil;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* The meta domain will try to load the meta server address from MetaServerProviders, the default
* ones are:
*
* <ul>
* <li>com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider</li>
* </ul>
* <p>
* If no provider could provide the meta server url, the default meta url will be used(http://apollo.meta).
* <br />
* <p>
* 3rd party MetaServerProvider could be injected by typical Java Service Loader pattern.
*
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
*/
public class MetaDomainConsts {
public static final String DEFAULT_META_URL = "http://apollo.meta";
// env -> meta server address cache
private static final Map<Env, String> metaServerAddressCache = Maps.newConcurrentMap();
private static volatile List<MetaServerProvider> metaServerProviders = null;
private static final long REFRESH_INTERVAL_IN_SECOND = 60;// 1 min
private static final Logger logger = DeferredLoggerFactory.getLogger(MetaDomainConsts.class);
// comma separated meta server address -> selected single meta server address cache
private static final Map<String, String> selectedMetaServerAddressCache = Maps.newConcurrentMap();
private static final AtomicBoolean periodicRefreshStarted = new AtomicBoolean(false);
private static final Object LOCK = new Object();
/**
* Return one meta server address. If multiple meta server addresses are configured, will select
* one.
*/
public static String getDomain(Env env) {
String metaServerAddress = getMetaServerAddress(env);
// if there is more than one address, need to select one
if (metaServerAddress.contains(",")) {
return selectMetaServerAddress(metaServerAddress);
}
return metaServerAddress;
}
/**
* Return meta server address. If multiple meta server addresses are configured, will return the
* comma separated string.
*/
public static String getMetaServerAddress(Env env) {
if (!metaServerAddressCache.containsKey(env)) {
initMetaServerAddress(env);
}
return metaServerAddressCache.get(env);
}
private static void initMetaServerAddress(Env env) {
if (metaServerProviders == null) {
synchronized (LOCK) {
if (metaServerProviders == null) {
metaServerProviders = initMetaServerProviders();
}
}
}
String metaAddress = null;
for (MetaServerProvider provider : metaServerProviders) {
metaAddress = provider.getMetaServerAddress(env);
if (!Strings.isNullOrEmpty(metaAddress)) {
logger.info("Located meta server address {} for env {} from {}", metaAddress, env,
provider.getClass().getName());
break;
}
}
if (Strings.isNullOrEmpty(metaAddress)) {
// Fallback to default meta address
metaAddress = DEFAULT_META_URL;
logger.warn(
"Meta server address fallback to {} for env {}, because it is not available in all MetaServerProviders",
metaAddress, env);
}
metaServerAddressCache.put(env, metaAddress.trim());
}
private static List<MetaServerProvider> initMetaServerProviders() {
Iterator<MetaServerProvider> metaServerProviderIterator = ServiceBootstrap
.loadAll(MetaServerProvider.class);
List<MetaServerProvider> metaServerProviders = Lists.newArrayList(metaServerProviderIterator);
Collections.sort(metaServerProviders, new Comparator<MetaServerProvider>() {
@Override
public int compare(MetaServerProvider o1, MetaServerProvider o2) {
// the smaller order has higher priority
return Integer.compare(o1.getOrder(), o2.getOrder());
}
});
return metaServerProviders;
}
/**
* Select one available meta server from the comma separated meta server addresses, e.g.
* http://1.2.3.4:8080,http://2.3.4.5:8080
* <p>
* <br />
* <p>
* In production environment, we still suggest using one single domain like
* http://config.xxx.com(backed by software load balancers like nginx) instead of multiple ip
* addresses
*/
private static String selectMetaServerAddress(String metaServerAddresses) {
String metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
if (metaAddressSelected == null) {
// initialize
if (periodicRefreshStarted.compareAndSet(false, true)) {
schedulePeriodicRefresh();
}
updateMetaServerAddresses(metaServerAddresses);
metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
}
return metaAddressSelected;
}
private static void updateMetaServerAddresses(String metaServerAddresses) {
logger.debug("Selecting meta server address for: {}", metaServerAddresses);
Transaction transaction = Tracer
.newTransaction("Apollo.MetaService", "refreshMetaServerAddress");
transaction.addData("Url", metaServerAddresses);
try {
List<String> metaServers = Lists.newArrayList(metaServerAddresses.split(","));
// random load balancing
Collections.shuffle(metaServers);
boolean serverAvailable = false;
for (String address : metaServers) {
address = address.trim();
//check whether /services/config is accessible
if (NetUtil.pingUrl(address + "/services/config")) {
// select the first available meta server
selectedMetaServerAddressCache.put(metaServerAddresses, address);
serverAvailable = true;
logger.debug("Selected meta server address {} for {}", address, metaServerAddresses);
break;
}
}
// we need to make sure the map is not empty, e.g. the first update might be failed
if (!selectedMetaServerAddressCache.containsKey(metaServerAddresses)) {
selectedMetaServerAddressCache.put(metaServerAddresses, metaServers.get(0).trim());
}
if (!serverAvailable) {
logger.warn(
"Could not find available meta server for configured meta server addresses: {}, fallback to: {}",
metaServerAddresses, selectedMetaServerAddressCache.get(metaServerAddresses));
}
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
throw ex;
} finally {
transaction.complete();
}
}
private static void schedulePeriodicRefresh() {
ScheduledExecutorService scheduledExecutorService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("MetaServiceLocator", true));
scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
for (String metaServerAddresses : selectedMetaServerAddressCache.keySet()) {
updateMetaServerAddresses(metaServerAddresses);
}
} catch (Throwable ex) {
logger
.warn(String.format("Refreshing meta server address failed, will retry in %d seconds",
REFRESH_INTERVAL_IN_SECOND), ex);
}
}
}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core;
import com.ctrip.framework.apollo.core.enums.Env;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.core.utils.NetUtil;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
/**
* The meta domain will try to load the meta server address from MetaServerProviders, the default
* ones are:
*
* <ul>
* <li>com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider</li>
* </ul>
* <p>
* If no provider could provide the meta server url, the default meta url will be used(http://apollo.meta).
* <br />
* <p>
* 3rd party MetaServerProvider could be injected by typical Java Service Loader pattern.
*
* @see com.ctrip.framework.apollo.core.internals.LegacyMetaServerProvider
*/
public class MetaDomainConsts {
public static final String DEFAULT_META_URL = "http://apollo.meta";
// env -> meta server address cache
private static final Map<Env, String> metaServerAddressCache = Maps.newConcurrentMap();
private static volatile List<MetaServerProvider> metaServerProviders = null;
private static final long REFRESH_INTERVAL_IN_SECOND = 60;// 1 min
private static final Logger logger = DeferredLoggerFactory.getLogger(MetaDomainConsts.class);
// comma separated meta server address -> selected single meta server address cache
private static final Map<String, String> selectedMetaServerAddressCache = Maps.newConcurrentMap();
private static final AtomicBoolean periodicRefreshStarted = new AtomicBoolean(false);
private static final Object LOCK = new Object();
/**
* Return one meta server address. If multiple meta server addresses are configured, will select
* one.
*/
public static String getDomain(Env env) {
String metaServerAddress = getMetaServerAddress(env);
// if there is more than one address, need to select one
if (metaServerAddress.contains(",")) {
return selectMetaServerAddress(metaServerAddress);
}
return metaServerAddress;
}
/**
* Return meta server address. If multiple meta server addresses are configured, will return the
* comma separated string.
*/
public static String getMetaServerAddress(Env env) {
if (!metaServerAddressCache.containsKey(env)) {
initMetaServerAddress(env);
}
return metaServerAddressCache.get(env);
}
private static void initMetaServerAddress(Env env) {
if (metaServerProviders == null) {
synchronized (LOCK) {
if (metaServerProviders == null) {
metaServerProviders = initMetaServerProviders();
}
}
}
String metaAddress = null;
for (MetaServerProvider provider : metaServerProviders) {
metaAddress = provider.getMetaServerAddress(env);
if (!Strings.isNullOrEmpty(metaAddress)) {
logger.info("Located meta server address {} for env {} from {}", metaAddress, env,
provider.getClass().getName());
break;
}
}
if (Strings.isNullOrEmpty(metaAddress)) {
// Fallback to default meta address
metaAddress = DEFAULT_META_URL;
logger.warn(
"Meta server address fallback to {} for env {}, because it is not available in all MetaServerProviders",
metaAddress, env);
}
metaServerAddressCache.put(env, metaAddress.trim());
}
private static List<MetaServerProvider> initMetaServerProviders() {
Iterator<MetaServerProvider> metaServerProviderIterator = ServiceBootstrap
.loadAll(MetaServerProvider.class);
List<MetaServerProvider> metaServerProviders = Lists.newArrayList(metaServerProviderIterator);
Collections.sort(metaServerProviders, new Comparator<MetaServerProvider>() {
@Override
public int compare(MetaServerProvider o1, MetaServerProvider o2) {
// the smaller order has higher priority
return Integer.compare(o1.getOrder(), o2.getOrder());
}
});
return metaServerProviders;
}
/**
* Select one available meta server from the comma separated meta server addresses, e.g.
* http://1.2.3.4:8080,http://2.3.4.5:8080
* <p>
* <br />
* <p>
* In production environment, we still suggest using one single domain like
* http://config.xxx.com(backed by software load balancers like nginx) instead of multiple ip
* addresses
*/
private static String selectMetaServerAddress(String metaServerAddresses) {
String metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
if (metaAddressSelected == null) {
// initialize
if (periodicRefreshStarted.compareAndSet(false, true)) {
schedulePeriodicRefresh();
}
updateMetaServerAddresses(metaServerAddresses);
metaAddressSelected = selectedMetaServerAddressCache.get(metaServerAddresses);
}
return metaAddressSelected;
}
private static void updateMetaServerAddresses(String metaServerAddresses) {
logger.debug("Selecting meta server address for: {}", metaServerAddresses);
Transaction transaction = Tracer
.newTransaction("Apollo.MetaService", "refreshMetaServerAddress");
transaction.addData("Url", metaServerAddresses);
try {
List<String> metaServers = Lists.newArrayList(metaServerAddresses.split(","));
// random load balancing
Collections.shuffle(metaServers);
boolean serverAvailable = false;
for (String address : metaServers) {
address = address.trim();
//check whether /services/config is accessible
if (NetUtil.pingUrl(address + "/services/config")) {
// select the first available meta server
selectedMetaServerAddressCache.put(metaServerAddresses, address);
serverAvailable = true;
logger.debug("Selected meta server address {} for {}", address, metaServerAddresses);
break;
}
}
// we need to make sure the map is not empty, e.g. the first update might be failed
if (!selectedMetaServerAddressCache.containsKey(metaServerAddresses)) {
selectedMetaServerAddressCache.put(metaServerAddresses, metaServers.get(0).trim());
}
if (!serverAvailable) {
logger.warn(
"Could not find available meta server for configured meta server addresses: {}, fallback to: {}",
metaServerAddresses, selectedMetaServerAddressCache.get(metaServerAddresses));
}
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
throw ex;
} finally {
transaction.complete();
}
}
private static void schedulePeriodicRefresh() {
ScheduledExecutorService scheduledExecutorService =
Executors.newScheduledThreadPool(1, ApolloThreadFactory.create("MetaServiceLocator", true));
scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
try {
for (String metaServerAddresses : selectedMetaServerAddressCache.keySet()) {
updateMetaServerAddresses(metaServerAddresses);
}
} catch (Throwable ex) {
logger
.warn(String.format("Refreshing meta server address failed, will retry in %d seconds",
REFRESH_INTERVAL_IN_SECOND), ex);
}
}
}, REFRESH_INTERVAL_IN_SECOND, REFRESH_INTERVAL_IN_SECOND, TimeUnit.SECONDS);
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/apollo-on-kubernetes/kubernetes/apollo-env-fat/service-apollo-admin-server-fat.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-fat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-fat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-fat
labels:
app: service-apollo-admin-server-fat
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-fat
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-fat
labels:
app: deployment-apollo-admin-server-fat
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-fat
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-fat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-fat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-fat
configMap:
name: configmap-apollo-admin-server-fat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-fat
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-fat
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-fat.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
---
# configmap for apollo-admin-server-fat
kind: ConfigMap
apiVersion: v1
metadata:
namespace: sre
name: configmap-apollo-admin-server-fat
data:
application-github.properties: |
spring.datasource.url = jdbc:mysql://service-mysql-for-apollo-fat-env.sre:3306/ApolloConfigDB?characterEncoding=utf8
spring.datasource.username = FillInCorrectUser
spring.datasource.password = FillInCorrectPassword
eureka.service.url = http://statefulset-apollo-config-server-fat-0.service-apollo-meta-server-fat:8080/eureka/,http://statefulset-apollo-config-server-fat-1.service-apollo-meta-server-fat:8080/eureka/
---
kind: Service
apiVersion: v1
metadata:
namespace: sre
name: service-apollo-admin-server-fat
labels:
app: service-apollo-admin-server-fat
spec:
ports:
- protocol: TCP
port: 8090
targetPort: 8090
selector:
app: pod-apollo-admin-server-fat
type: ClusterIP
sessionAffinity: ClientIP
---
kind: Deployment
apiVersion: apps/v1
metadata:
namespace: sre
name: deployment-apollo-admin-server-fat
labels:
app: deployment-apollo-admin-server-fat
spec:
replicas: 2
selector:
matchLabels:
app: pod-apollo-admin-server-fat
strategy:
rollingUpdate:
maxSurge: 1
maxUnavailable: 1
type: RollingUpdate
template:
metadata:
labels:
app: pod-apollo-admin-server-fat
spec:
affinity:
podAntiAffinity:
preferredDuringSchedulingIgnoredDuringExecution:
- weight: 100
podAffinityTerm:
labelSelector:
matchExpressions:
- key: app
operator: In
values:
- pod-apollo-admin-server-fat
topologyKey: kubernetes.io/hostname
volumes:
- name: volume-configmap-apollo-admin-server-fat
configMap:
name: configmap-apollo-admin-server-fat
items:
- key: application-github.properties
path: application-github.properties
containers:
- image: apolloconfig/apollo-adminservice:1.9.0-SNAPSHOT
securityContext:
privileged: true
imagePullPolicy: IfNotPresent
name: container-apollo-admin-server-fat
ports:
- protocol: TCP
containerPort: 8090
volumeMounts:
- name: volume-configmap-apollo-admin-server-fat
mountPath: /apollo-adminservice/config/application-github.properties
subPath: application-github.properties
env:
- name: APOLLO_ADMIN_SERVICE_NAME
value: "service-apollo-admin-server-fat.sre"
readinessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 10
periodSeconds: 5
livenessProbe:
tcpSocket:
port: 8090
initialDelaySeconds: 120
periodSeconds: 10
dnsPolicy: ClusterFirst
restartPolicy: Always | -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/importer/ApolloConfigDataLoader.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySource;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
import org.springframework.boot.BootstrapRegistry.InstanceSupplier;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.config.ConfigData;
import org.springframework.boot.context.config.ConfigDataLoader;
import org.springframework.boot.context.config.ConfigDataLoaderContext;
import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.core.Ordered;
import org.springframework.core.env.PropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigDataLoader implements ConfigDataLoader<ApolloConfigDataResource>, Ordered {
private final Log log;
public ApolloConfigDataLoader(Log log) {
this.log = log;
}
@Override
public ConfigData load(ConfigDataLoaderContext context, ApolloConfigDataResource resource)
throws IOException, ConfigDataResourceNotFoundException {
ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext();
Binder binder = bootstrapContext.get(Binder.class);
BindHandler bindHandler = this.getBindHandler(context);
bootstrapContext.registerIfAbsent(ApolloConfigDataLoaderInitializer.class, InstanceSupplier
.from(() -> new ApolloConfigDataLoaderInitializer(this.log, binder, bindHandler,
bootstrapContext)));
ApolloConfigDataLoaderInitializer apolloConfigDataLoaderInitializer = bootstrapContext
.get(ApolloConfigDataLoaderInitializer.class);
// init apollo client
List<PropertySource<?>> initialPropertySourceList = apolloConfigDataLoaderInitializer
.initApolloClient();
// load config
bootstrapContext.registerIfAbsent(ConfigPropertySourceFactory.class,
InstanceSupplier.from(() -> SpringInjector.getInstance(ConfigPropertySourceFactory.class)));
ConfigPropertySourceFactory configPropertySourceFactory = bootstrapContext
.get(ConfigPropertySourceFactory.class);
String namespace = resource.getNamespace();
Config config = ConfigService.getConfig(namespace);
ConfigPropertySource configPropertySource = configPropertySourceFactory
.getConfigPropertySource(namespace, config);
List<PropertySource<?>> propertySourceList = new ArrayList<>();
propertySourceList.add(configPropertySource);
propertySourceList.addAll(initialPropertySourceList);
log.debug(Slf4jLogMessageFormatter
.format("apollo client loaded namespace [{}]", resource.getNamespace()));
return new ConfigData(propertySourceList);
}
private BindHandler getBindHandler(ConfigDataLoaderContext context) {
return context.getBootstrapContext().getOrElse(BindHandler.class, null);
}
@Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE + 100;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySource;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
import org.springframework.boot.BootstrapRegistry.InstanceSupplier;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.config.ConfigData;
import org.springframework.boot.context.config.ConfigDataLoader;
import org.springframework.boot.context.config.ConfigDataLoaderContext;
import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.core.Ordered;
import org.springframework.core.env.PropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigDataLoader implements ConfigDataLoader<ApolloConfigDataResource>, Ordered {
private final Log log;
public ApolloConfigDataLoader(Log log) {
this.log = log;
}
@Override
public ConfigData load(ConfigDataLoaderContext context, ApolloConfigDataResource resource)
throws IOException, ConfigDataResourceNotFoundException {
ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext();
Binder binder = bootstrapContext.get(Binder.class);
BindHandler bindHandler = this.getBindHandler(context);
bootstrapContext.registerIfAbsent(ApolloConfigDataLoaderInitializer.class, InstanceSupplier
.from(() -> new ApolloConfigDataLoaderInitializer(this.log, binder, bindHandler,
bootstrapContext)));
ApolloConfigDataLoaderInitializer apolloConfigDataLoaderInitializer = bootstrapContext
.get(ApolloConfigDataLoaderInitializer.class);
// init apollo client
List<PropertySource<?>> initialPropertySourceList = apolloConfigDataLoaderInitializer
.initApolloClient();
// load config
bootstrapContext.registerIfAbsent(ConfigPropertySourceFactory.class,
InstanceSupplier.from(() -> SpringInjector.getInstance(ConfigPropertySourceFactory.class)));
ConfigPropertySourceFactory configPropertySourceFactory = bootstrapContext
.get(ConfigPropertySourceFactory.class);
String namespace = resource.getNamespace();
Config config = ConfigService.getConfig(namespace);
ConfigPropertySource configPropertySource = configPropertySourceFactory
.getConfigPropertySource(namespace, config);
List<PropertySource<?>> propertySourceList = new ArrayList<>();
propertySourceList.add(configPropertySource);
propertySourceList.addAll(initialPropertySourceList);
log.debug(Slf4jLogMessageFormatter
.format("apollo client loaded namespace [{}]", resource.getNamespace()));
return new ConfigData(propertySourceList);
}
private BindHandler getBindHandler(ConfigDataLoaderContext context) {
return context.getBootstrapContext().getOrElse(BindHandler.class, null);
}
@Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE + 100;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCache.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.biz.repository.AccessKeyRepository;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.MultimapBuilder.ListMultimapBuilder;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
/**
* @author nisiyong
*/
@Service
public class AccessKeyServiceWithCache implements InitializingBean {
private static Logger logger = LoggerFactory.getLogger(AccessKeyServiceWithCache.class);
private final AccessKeyRepository accessKeyRepository;
private final BizConfig bizConfig;
private int scanInterval;
private TimeUnit scanIntervalTimeUnit;
private int rebuildInterval;
private TimeUnit rebuildIntervalTimeUnit;
private ScheduledExecutorService scheduledExecutorService;
private Date lastTimeScanned;
private ListMultimap<String, AccessKey> accessKeyCache;
private ConcurrentMap<Long, AccessKey> accessKeyIdCache;
@Autowired
public AccessKeyServiceWithCache(AccessKeyRepository accessKeyRepository, BizConfig bizConfig) {
this.accessKeyRepository = accessKeyRepository;
this.bizConfig = bizConfig;
initialize();
}
private void initialize() {
scheduledExecutorService = new ScheduledThreadPoolExecutor(1,
ApolloThreadFactory.create("AccessKeyServiceWithCache", true));
lastTimeScanned = new Date(0L);
ListMultimap<String, AccessKey> multimap = ListMultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER)
.arrayListValues().build();
accessKeyCache = Multimaps.synchronizedListMultimap(multimap);
accessKeyIdCache = Maps.newConcurrentMap();
}
public List<String> getAvailableSecrets(String appId) {
List<AccessKey> accessKeys = accessKeyCache.get(appId);
if (CollectionUtils.isEmpty(accessKeys)) {
return Collections.emptyList();
}
return accessKeys.stream()
.filter(AccessKey::isEnabled)
.map(AccessKey::getSecret)
.collect(Collectors.toList());
}
@Override
public void afterPropertiesSet() throws Exception {
populateDataBaseInterval();
scanNewAndUpdatedAccessKeys(); //block the startup process until load finished
scheduledExecutorService.scheduleWithFixedDelay(this::scanNewAndUpdatedAccessKeys,
scanInterval, scanInterval, scanIntervalTimeUnit);
scheduledExecutorService.scheduleAtFixedRate(this::rebuildAccessKeyCache,
rebuildInterval, rebuildInterval, rebuildIntervalTimeUnit);
}
private void scanNewAndUpdatedAccessKeys() {
Transaction transaction = Tracer.newTransaction("Apollo.AccessKeyServiceWithCache",
"scanNewAndUpdatedAccessKeys");
try {
loadNewAndUpdatedAccessKeys();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Load new/updated app access keys failed", ex);
} finally {
transaction.complete();
}
}
private void rebuildAccessKeyCache() {
Transaction transaction = Tracer.newTransaction("Apollo.AccessKeyServiceWithCache",
"rebuildCache");
try {
deleteAccessKeyCache();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Rebuild cache failed", ex);
} finally {
transaction.complete();
}
}
private void loadNewAndUpdatedAccessKeys() {
boolean hasMore = true;
while (hasMore && !Thread.currentThread().isInterrupted()) {
//current batch is 500
List<AccessKey> accessKeys = accessKeyRepository
.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(lastTimeScanned);
if (CollectionUtils.isEmpty(accessKeys)) {
break;
}
int scanned = accessKeys.size();
mergeAccessKeys(accessKeys);
logger.info("Loaded {} new/updated Accesskey from startTime {}", scanned, lastTimeScanned);
hasMore = scanned == 500;
lastTimeScanned = accessKeys.get(scanned - 1).getDataChangeLastModifiedTime();
// In order to avoid missing some records at the last time, we need to scan records at this time individually
if (hasMore) {
List<AccessKey> lastModifiedTimeAccessKeys = accessKeyRepository.findByDataChangeLastModifiedTime(lastTimeScanned);
mergeAccessKeys(lastModifiedTimeAccessKeys);
logger.info("Loaded {} new/updated Accesskey at lastModifiedTime {}", scanned, lastTimeScanned);
}
}
}
private void mergeAccessKeys(List<AccessKey> accessKeys) {
for (AccessKey accessKey : accessKeys) {
AccessKey thatInCache = accessKeyIdCache.get(accessKey.getId());
accessKeyIdCache.put(accessKey.getId(), accessKey);
accessKeyCache.put(accessKey.getAppId(), accessKey);
if (thatInCache != null && accessKey.getDataChangeLastModifiedTime()
.after(thatInCache.getDataChangeLastModifiedTime())) {
accessKeyCache.remove(accessKey.getAppId(), thatInCache);
logger.info("Found Accesskey changes, old: {}, new: {}", thatInCache, accessKey);
}
}
}
private void deleteAccessKeyCache() {
List<Long> ids = Lists.newArrayList(accessKeyIdCache.keySet());
if (CollectionUtils.isEmpty(ids)) {
return;
}
List<List<Long>> partitionIds = Lists.partition(ids, 500);
for (List<Long> toRebuildIds : partitionIds) {
Iterable<AccessKey> accessKeys = accessKeyRepository.findAllById(toRebuildIds);
Set<Long> foundIds = Sets.newHashSet();
for (AccessKey accessKey : accessKeys) {
foundIds.add(accessKey.getId());
}
//handle deleted
SetView<Long> deletedIds = Sets.difference(Sets.newHashSet(toRebuildIds), foundIds);
handleDeletedAccessKeys(deletedIds);
}
}
private void handleDeletedAccessKeys(Set<Long> deletedIds) {
if (CollectionUtils.isEmpty(deletedIds)) {
return;
}
for (Long deletedId : deletedIds) {
AccessKey deleted = accessKeyIdCache.remove(deletedId);
if (deleted == null) {
continue;
}
accessKeyCache.remove(deleted.getAppId(), deleted);
logger.info("Found AccessKey deleted, {}", deleted);
}
}
private void populateDataBaseInterval() {
scanInterval = bizConfig.accessKeyCacheScanInterval();
scanIntervalTimeUnit = bizConfig.accessKeyCacheScanIntervalTimeUnit();
rebuildInterval = bizConfig.accessKeyCacheRebuildInterval();
rebuildIntervalTimeUnit = bizConfig.accessKeyCacheRebuildIntervalTimeUnit();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.AccessKey;
import com.ctrip.framework.apollo.biz.repository.AccessKeyRepository;
import com.ctrip.framework.apollo.core.utils.ApolloThreadFactory;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.MultimapBuilder.ListMultimapBuilder;
import com.google.common.collect.Multimaps;
import com.google.common.collect.Sets;
import com.google.common.collect.Sets.SetView;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
/**
* @author nisiyong
*/
@Service
public class AccessKeyServiceWithCache implements InitializingBean {
private static Logger logger = LoggerFactory.getLogger(AccessKeyServiceWithCache.class);
private final AccessKeyRepository accessKeyRepository;
private final BizConfig bizConfig;
private int scanInterval;
private TimeUnit scanIntervalTimeUnit;
private int rebuildInterval;
private TimeUnit rebuildIntervalTimeUnit;
private ScheduledExecutorService scheduledExecutorService;
private Date lastTimeScanned;
private ListMultimap<String, AccessKey> accessKeyCache;
private ConcurrentMap<Long, AccessKey> accessKeyIdCache;
@Autowired
public AccessKeyServiceWithCache(AccessKeyRepository accessKeyRepository, BizConfig bizConfig) {
this.accessKeyRepository = accessKeyRepository;
this.bizConfig = bizConfig;
initialize();
}
private void initialize() {
scheduledExecutorService = new ScheduledThreadPoolExecutor(1,
ApolloThreadFactory.create("AccessKeyServiceWithCache", true));
lastTimeScanned = new Date(0L);
ListMultimap<String, AccessKey> multimap = ListMultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER)
.arrayListValues().build();
accessKeyCache = Multimaps.synchronizedListMultimap(multimap);
accessKeyIdCache = Maps.newConcurrentMap();
}
public List<String> getAvailableSecrets(String appId) {
List<AccessKey> accessKeys = accessKeyCache.get(appId);
if (CollectionUtils.isEmpty(accessKeys)) {
return Collections.emptyList();
}
return accessKeys.stream()
.filter(AccessKey::isEnabled)
.map(AccessKey::getSecret)
.collect(Collectors.toList());
}
@Override
public void afterPropertiesSet() throws Exception {
populateDataBaseInterval();
scanNewAndUpdatedAccessKeys(); //block the startup process until load finished
scheduledExecutorService.scheduleWithFixedDelay(this::scanNewAndUpdatedAccessKeys,
scanInterval, scanInterval, scanIntervalTimeUnit);
scheduledExecutorService.scheduleAtFixedRate(this::rebuildAccessKeyCache,
rebuildInterval, rebuildInterval, rebuildIntervalTimeUnit);
}
private void scanNewAndUpdatedAccessKeys() {
Transaction transaction = Tracer.newTransaction("Apollo.AccessKeyServiceWithCache",
"scanNewAndUpdatedAccessKeys");
try {
loadNewAndUpdatedAccessKeys();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Load new/updated app access keys failed", ex);
} finally {
transaction.complete();
}
}
private void rebuildAccessKeyCache() {
Transaction transaction = Tracer.newTransaction("Apollo.AccessKeyServiceWithCache",
"rebuildCache");
try {
deleteAccessKeyCache();
transaction.setStatus(Transaction.SUCCESS);
} catch (Throwable ex) {
transaction.setStatus(ex);
logger.error("Rebuild cache failed", ex);
} finally {
transaction.complete();
}
}
private void loadNewAndUpdatedAccessKeys() {
boolean hasMore = true;
while (hasMore && !Thread.currentThread().isInterrupted()) {
//current batch is 500
List<AccessKey> accessKeys = accessKeyRepository
.findFirst500ByDataChangeLastModifiedTimeGreaterThanOrderByDataChangeLastModifiedTimeAsc(lastTimeScanned);
if (CollectionUtils.isEmpty(accessKeys)) {
break;
}
int scanned = accessKeys.size();
mergeAccessKeys(accessKeys);
logger.info("Loaded {} new/updated Accesskey from startTime {}", scanned, lastTimeScanned);
hasMore = scanned == 500;
lastTimeScanned = accessKeys.get(scanned - 1).getDataChangeLastModifiedTime();
// In order to avoid missing some records at the last time, we need to scan records at this time individually
if (hasMore) {
List<AccessKey> lastModifiedTimeAccessKeys = accessKeyRepository.findByDataChangeLastModifiedTime(lastTimeScanned);
mergeAccessKeys(lastModifiedTimeAccessKeys);
logger.info("Loaded {} new/updated Accesskey at lastModifiedTime {}", scanned, lastTimeScanned);
}
}
}
private void mergeAccessKeys(List<AccessKey> accessKeys) {
for (AccessKey accessKey : accessKeys) {
AccessKey thatInCache = accessKeyIdCache.get(accessKey.getId());
accessKeyIdCache.put(accessKey.getId(), accessKey);
accessKeyCache.put(accessKey.getAppId(), accessKey);
if (thatInCache != null && accessKey.getDataChangeLastModifiedTime()
.after(thatInCache.getDataChangeLastModifiedTime())) {
accessKeyCache.remove(accessKey.getAppId(), thatInCache);
logger.info("Found Accesskey changes, old: {}, new: {}", thatInCache, accessKey);
}
}
}
private void deleteAccessKeyCache() {
List<Long> ids = Lists.newArrayList(accessKeyIdCache.keySet());
if (CollectionUtils.isEmpty(ids)) {
return;
}
List<List<Long>> partitionIds = Lists.partition(ids, 500);
for (List<Long> toRebuildIds : partitionIds) {
Iterable<AccessKey> accessKeys = accessKeyRepository.findAllById(toRebuildIds);
Set<Long> foundIds = Sets.newHashSet();
for (AccessKey accessKey : accessKeys) {
foundIds.add(accessKey.getId());
}
//handle deleted
SetView<Long> deletedIds = Sets.difference(Sets.newHashSet(toRebuildIds), foundIds);
handleDeletedAccessKeys(deletedIds);
}
}
private void handleDeletedAccessKeys(Set<Long> deletedIds) {
if (CollectionUtils.isEmpty(deletedIds)) {
return;
}
for (Long deletedId : deletedIds) {
AccessKey deleted = accessKeyIdCache.remove(deletedId);
if (deleted == null) {
continue;
}
accessKeyCache.remove(deleted.getAppId(), deleted);
logger.info("Found AccessKey deleted, {}", deleted);
}
}
private void populateDataBaseInterval() {
scanInterval = bizConfig.accessKeyCacheScanInterval();
scanIntervalTimeUnit = bizConfig.accessKeyCacheScanIntervalTimeUnit();
rebuildInterval = bizConfig.accessKeyCacheRebuildInterval();
rebuildIntervalTimeUnit = bizConfig.accessKeyCacheRebuildIntervalTimeUnit();
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/MessageSender.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.message;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageSender {
void sendMessage(String message, String channel);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.message;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageSender {
void sendMessage(String message, String channel);
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpRequest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.http;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class HttpRequest {
private String m_url;
private Map<String, String> headers;
private int m_connectTimeout;
private int m_readTimeout;
/**
* Create the request for the url.
* @param url the url
*/
public HttpRequest(String url) {
this.m_url = url;
m_connectTimeout = -1;
m_readTimeout = -1;
}
public String getUrl() {
return m_url;
}
public Map<String, String> getHeaders() {
return headers;
}
public void setHeaders(Map<String, String> headers) {
this.headers = headers;
}
public int getConnectTimeout() {
return m_connectTimeout;
}
public void setConnectTimeout(int connectTimeout) {
this.m_connectTimeout = connectTimeout;
}
public int getReadTimeout() {
return m_readTimeout;
}
public void setReadTimeout(int readTimeout) {
this.m_readTimeout = readTimeout;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.http;
import java.util.Map;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class HttpRequest {
private String m_url;
private Map<String, String> headers;
private int m_connectTimeout;
private int m_readTimeout;
/**
* Create the request for the url.
* @param url the url
*/
public HttpRequest(String url) {
this.m_url = url;
m_connectTimeout = -1;
m_readTimeout = -1;
}
public String getUrl() {
return m_url;
}
public Map<String, String> getHeaders() {
return headers;
}
public void setHeaders(Map<String, String> headers) {
this.headers = headers;
}
public int getConnectTimeout() {
return m_connectTimeout;
}
public void setConnectTimeout(int connectTimeout) {
this.m_connectTimeout = connectTimeout;
}
public int getReadTimeout() {
return m_readTimeout;
}
public void setReadTimeout(int readTimeout) {
this.m_readTimeout = readTimeout;
}
}
| -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/charts/apollo-service-0.2.0.tgz | ) +aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=Helm <ks8_ѫdkgR#WU;QřTmmM %aL St
I)RlgH F$aŜ9;2
_tvGn {!
e&/UdORHD?3}DQs߸]'@ ) )ZJ`sFt V rL)K>8>E&JEtTMfCӎ|.H_RS[֞I>g
*mؙPO E~gJ(|&| ~Nǝy[ik*B
9m)ypG? 09J9 3c5Qwy'y2]vI8CcP' )o47z,|p ^W0R9`yj9 Z<88 ; @&چ/٠z#QvZ݈HyE?>g }3JP6 PgL L8 k5
P |D!ԜiC&T `\f0 %WYj.Q$zy8r8U%؊J483<۾l`: tJ1#.x3"W0 w \Tc0 k*?+{MojbjPxYB 0ƕ1҃,K=qvVmh75L B:G⣌*J·k9 5BAyymAi#;#:NWFZ!|DCZ(y~
Q0T([1 B,ŐL
d\Q
.ِ"S`W
:z=<vr;[F2B@Mh ~Qf t.$NỈ< jZ*ds*8jvDP-xX) 4 X1:t㵣EuBT( ŏ?3 5+.W(6FF#-Ke~ͬ*?niU
֨XfT~0*ێJW8BPvvp 5I SwHnFή?BkDY,@GIh] l.s3LڜRk~<xﴵUcTnIFGX,`QW ~iqZڶg7$-[ ?RCgB+$t&sE \X./y9(Pq{JN
R5. =y?,[ Mt^dx~K>+;^ 'IH
\*;PF/Fx Sf
eTB"A
wӉ gDvČ1=
mkqs ڷ
VBp}y MH
=ۉbZ,@6F @"@aG\.X.[Z1e)qûpIK=-,i*˥'!(
fҸH|u0sNV "Qׇ?qnyzP $L6MP{-J,
v;Fd*(''C7vM-(2q-?q[Wz@Fj3$2U
Y,,K,+\1?_E(AjѶ43zynm/gٕni캮|<0B!]=4\ {Xt^ÜN=@/!>n'kOAHJ|Z`&VkA;^<K7GEjRIw>R
̸
l&[m[HO*g,9+&uQ_AhD@"Ƀ^ɫ*<X# ,(ǷXfcf&{]g*+bZO0,ebk8]3*y-V[K[,axKaJTcJzŽV 6LPыrwe`ĵwv j|\ե k\r\U WIx
Znrr^FVZR7މAˡxf{N#{l1+ ?)zKvnV} md6mdƪe+ u#
{3QTn>a5a7N)Jv^ DPxq;9ўD38~*?FՆlbQotvte
6vV~7~{aŰk,T]xl`L9kʖՙm\{č-gUoHf?}.@+#zJTiTi&Ϣ*ZnHPA Q%5ڑb(^6ZU̪ԦD^!y+ XĹe2V >ҫ4d$Y O~c4M-Ui>؈%)LurLi1>%܈jJy(+L) Y˜)f`c ک}oױfy/QH(Wluhnl Ml6m Y =8w4QUYnЪjaM&DV "*.φɛȏNڑ/A!oA\U+ʃIS o\>\^yO\\>;x ՜YH6i[f`#7yw?+4El^.#H:+2ckTR~nPSuj6ٮ,+&l6T9R$q *?
/ِUܒVETZy`igIhGLot&HB5yMya߮`n$3";Îe^?U{ 1t3HlF$髏0/M^ &{?G~x$eC'k P.))}..c@P6iT #i6Ũtnj
pQJ|0Uׇĩ6DY#U UeXFl
V5V2ՅJ:^UVyw2 ZBȪd?4fm)ii*yV[a]p%j7
j4 ]=Z(xUt'ѫ"W WyOcG S O?})ʦti$e> =ik9\+=vAG q:GqΧ;v9ȐTOφ;TO -7ݛ7QoI&E!?esxO;VG]f 6Y*ծ'H=sMG85KMk s2ԖZ5UUZ=o: f!nF Z:Y0٬ ~]ǐ7ȂەaeItjof;ܾT?Mp}1}/z?g( 6] ijػ{7+ 㓒w??ESVl6%u3vk;H*aTQT9p0f-[9nqF_iA~')^\%)6W,9l(S?1:lmNY=!Yc;1"q 5U[_
Fb4bWdբdݸ5eٱ6a`A)Sr-gC'!'su2vћP((MH܊ݰ4t?')6Q`yh s 2w'Nq:?:(}x)Ks y ጆ7du^ gQ, C|hk) C M<*y &EG 6x]x;̴$ABuܷן輄OP! wLU;DM^L 'ysYf/ڕ 絫7t_%|"˷q#G_9.
tluwܹy}k_e_ J t | ) +aHR0cHM6Ly95b3V0dS5iZS96OVV6MWljandyTQo=Helm <ks8_ѫdkgR#WU;QřTmmM %aL St
I)RlgH F$aŜ9;2
_tvGn {!
e&/UdORHD?3}DQs߸]'@ ) )ZJ`sFt V rL)K>8>E&JEtTMfCӎ|.H_RS[֞I>g
*mؙPO E~gJ(|&| ~Nǝy[ik*B
9m)ypG? 09J9 3c5Qwy'y2]vI8CcP' )o47z,|p ^W0R9`yj9 Z<88 ; @&چ/٠z#QvZ݈HyE?>g }3JP6 PgL L8 k5
P |D!ԜiC&T `\f0 %WYj.Q$zy8r8U%؊J483<۾l`: tJ1#.x3"W0 w \Tc0 k*?+{MojbjPxYB 0ƕ1҃,K=qvVmh75L B:G⣌*J·k9 5BAyymAi#;#:NWFZ!|DCZ(y~
Q0T([1 B,ŐL
d\Q
.ِ"S`W
:z=<vr;[F2B@Mh ~Qf t.$NỈ< jZ*ds*8jvDP-xX) 4 X1:t㵣EuBT( ŏ?3 5+.W(6FF#-Ke~ͬ*?niU
֨XfT~0*ێJW8BPvvp 5I SwHnFή?BkDY,@GIh] l.s3LڜRk~<xﴵUcTnIFGX,`QW ~iqZڶg7$-[ ?RCgB+$t&sE \X./y9(Pq{JN
R5. =y?,[ Mt^dx~K>+;^ 'IH
\*;PF/Fx Sf
eTB"A
wӉ gDvČ1=
mkqs ڷ
VBp}y MH
=ۉbZ,@6F @"@aG\.X.[Z1e)qûpIK=-,i*˥'!(
fҸH|u0sNV "Qׇ?qnyzP $L6MP{-J,
v;Fd*(''C7vM-(2q-?q[Wz@Fj3$2U
Y,,K,+\1?_E(AjѶ43zynm/gٕni캮|<0B!]=4\ {Xt^ÜN=@/!>n'kOAHJ|Z`&VkA;^<K7GEjRIw>R
̸
l&[m[HO*g,9+&uQ_AhD@"Ƀ^ɫ*<X# ,(ǷXfcf&{]g*+bZO0,ebk8]3*y-V[K[,axKaJTcJzŽV 6LPыrwe`ĵwv j|\ե k\r\U WIx
Znrr^FVZR7މAˡxf{N#{l1+ ?)zKvnV} md6mdƪe+ u#
{3QTn>a5a7N)Jv^ DPxq;9ўD38~*?FՆlbQotvte
6vV~7~{aŰk,T]xl`L9kʖՙm\{č-gUoHf?}.@+#zJTiTi&Ϣ*ZnHPA Q%5ڑb(^6ZU̪ԦD^!y+ XĹe2V >ҫ4d$Y O~c4M-Ui>؈%)LurLi1>%܈jJy(+L) Y˜)f`c ک}oױfy/QH(Wluhnl Ml6m Y =8w4QUYnЪjaM&DV "*.φɛȏNڑ/A!oA\U+ʃIS o\>\^yO\\>;x ՜YH6i[f`#7yw?+4El^.#H:+2ckTR~nPSuj6ٮ,+&l6T9R$q *?
/ِUܒVETZy`igIhGLot&HB5yMya߮`n$3";Îe^?U{ 1t3HlF$髏0/M^ &{?G~x$eC'k P.))}..c@P6iT #i6Ũtnj
pQJ|0Uׇĩ6DY#U UeXFl
V5V2ՅJ:^UVyw2 ZBȪd?4fm)ii*yV[a]p%j7
j4 ]=Z(xUt'ѫ"W WyOcG S O?})ʦti$e> =ik9\+=vAG q:GqΧ;v9ȐTOφ;TO -7ݛ7QoI&E!?esxO;VG]f 6Y*ծ'H=sMG85KMk s2ԖZ5UUZ=o: f!nF Z:Y0٬ ~]ǐ7ȂەaeItjof;ܾT?Mp}1}/z?g( 6] ijػ{7+ 㓒w??ESVl6%u3vk;H*aTQT9p0f-[9nqF_iA~')^\%)6W,9l(S?1:lmNY=!Yc;1"q 5U[_
Fb4bWdբdݸ5eٱ6a`A)Sr-gC'!'su2vћP((MH܊ݰ4t?')6Q`yh s 2w'Nq:?:(}x)Ks y ጆ7du^ gQ, C|hk) C M<*y &EG 6x]x;̴$ABuܷן輄OP! wLU;DM^L 'ysYf/ڕ 絫7t_%|"˷q#G_9.
tluwܹy}k_e_ J t | -1 |
apolloconfig/apollo | 3,871 | Summer2021 support more format | ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| lepdou | 2021-08-05T10:06:48Z | 2021-08-05T12:40:42Z | 109c98d2f6417ee39568c0eb0ad33b0bcdf92dff | 278114744e1942df45ca2754f6cdec362dee0481 | Summer2021 support more format. ## What's the purpose of this PR
1. remove useless code
2. add change log
3. fix failed ut
## Which issue(s) this PR fixes:
https://github.com/ctripcorp/apollo/discussions/3815
## Brief changelog
remove useless code and add change log
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/NamespaceServiceIntegrationTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.biz.entity.Commit;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.repository.InstanceConfigRepository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.context.jdbc.Sql;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
public class NamespaceServiceIntegrationTest extends AbstractIntegrationTest {
@Autowired
private NamespaceService namespaceService;
@Autowired
private ItemService itemService;
@Autowired
private CommitService commitService;
@Autowired
private AppNamespaceService appNamespaceService;
@Autowired
private ClusterService clusterService;
@Autowired
private ReleaseService releaseService;
@Autowired
private ReleaseHistoryService releaseHistoryService;
@Autowired
private InstanceConfigRepository instanceConfigRepository;
private String testApp = "testApp";
private String testCluster = "default";
private String testChildCluster = "child-cluster";
private String testPrivateNamespace = "application";
private String testUser = "apollo";
private String commitTestApp = "commitTestApp";
@Test
@Sql(scripts = "/sql/namespace-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testDeleteNamespace() {
Namespace namespace = new Namespace();
namespace.setAppId(testApp);
namespace.setClusterName(testCluster);
namespace.setNamespaceName(testPrivateNamespace);
namespace.setId(1);
namespaceService.deleteNamespace(namespace, testUser);
List<Item> items = itemService.findItemsWithoutOrdered(testApp, testCluster, testPrivateNamespace);
List<Commit> commits = commitService.find(testApp, testCluster, testPrivateNamespace, PageRequest.of(0, 10));
AppNamespace appNamespace = appNamespaceService.findOne(testApp, testPrivateNamespace);
List<Cluster> childClusters = clusterService.findChildClusters(testApp, testCluster);
InstanceConfig instanceConfig = instanceConfigRepository.findById(1L).orElse(null);
List<Release> parentNamespaceReleases = releaseService.findActiveReleases(testApp, testCluster,
testPrivateNamespace,
PageRequest.of(0, 10));
List<Release> childNamespaceReleases = releaseService.findActiveReleases(testApp, testChildCluster,
testPrivateNamespace,
PageRequest.of(0, 10));
Page<ReleaseHistory> releaseHistories =
releaseHistoryService
.findReleaseHistoriesByNamespace(testApp, testCluster, testPrivateNamespace, PageRequest.of(0, 10));
assertEquals(0, items.size());
assertEquals(0, commits.size());
assertNotNull(appNamespace);
assertEquals(0, childClusters.size());
assertEquals(0, parentNamespaceReleases.size());
assertEquals(0, childNamespaceReleases.size());
assertTrue(!releaseHistories.hasContent());
assertNull(instanceConfig);
}
@Test
@Sql(scripts = "/sql/namespace-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testGetCommitsByModifiedTime() throws ParseException {
String format = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
Date lastModifiedTime = simpleDateFormat.parse("2020-08-22 09:00:00");
List<Commit> commitsByDate = commitService.find(commitTestApp, testCluster, testPrivateNamespace, lastModifiedTime, null);
Date lastModifiedTimeGreater = simpleDateFormat.parse("2020-08-22 11:00:00");
List<Commit> commitsByDateGreater = commitService.find(commitTestApp, testCluster, testPrivateNamespace, lastModifiedTimeGreater, null);
Date lastModifiedTimePage = simpleDateFormat.parse("2020-08-22 09:30:00");
List<Commit> commitsByDatePage = commitService.find(commitTestApp, testCluster, testPrivateNamespace, lastModifiedTimePage, PageRequest.of(0, 1));
assertEquals(1, commitsByDate.size());
assertEquals(0, commitsByDateGreater.size());
assertEquals(1, commitsByDatePage.size());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.biz.entity.Commit;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.entity.Release;
import com.ctrip.framework.apollo.biz.entity.ReleaseHistory;
import com.ctrip.framework.apollo.biz.repository.InstanceConfigRepository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.test.context.jdbc.Sql;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
public class NamespaceServiceIntegrationTest extends AbstractIntegrationTest {
@Autowired
private NamespaceService namespaceService;
@Autowired
private ItemService itemService;
@Autowired
private CommitService commitService;
@Autowired
private AppNamespaceService appNamespaceService;
@Autowired
private ClusterService clusterService;
@Autowired
private ReleaseService releaseService;
@Autowired
private ReleaseHistoryService releaseHistoryService;
@Autowired
private InstanceConfigRepository instanceConfigRepository;
private String testApp = "testApp";
private String testCluster = "default";
private String testChildCluster = "child-cluster";
private String testPrivateNamespace = "application";
private String testUser = "apollo";
private String commitTestApp = "commitTestApp";
@Test
@Sql(scripts = "/sql/namespace-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testDeleteNamespace() {
Namespace namespace = new Namespace();
namespace.setAppId(testApp);
namespace.setClusterName(testCluster);
namespace.setNamespaceName(testPrivateNamespace);
namespace.setId(1);
namespaceService.deleteNamespace(namespace, testUser);
List<Item> items = itemService.findItemsWithoutOrdered(testApp, testCluster, testPrivateNamespace);
List<Commit> commits = commitService.find(testApp, testCluster, testPrivateNamespace, PageRequest.of(0, 10));
AppNamespace appNamespace = appNamespaceService.findOne(testApp, testPrivateNamespace);
List<Cluster> childClusters = clusterService.findChildClusters(testApp, testCluster);
InstanceConfig instanceConfig = instanceConfigRepository.findById(1L).orElse(null);
List<Release> parentNamespaceReleases = releaseService.findActiveReleases(testApp, testCluster,
testPrivateNamespace,
PageRequest.of(0, 10));
List<Release> childNamespaceReleases = releaseService.findActiveReleases(testApp, testChildCluster,
testPrivateNamespace,
PageRequest.of(0, 10));
Page<ReleaseHistory> releaseHistories =
releaseHistoryService
.findReleaseHistoriesByNamespace(testApp, testCluster, testPrivateNamespace, PageRequest.of(0, 10));
assertEquals(0, items.size());
assertEquals(0, commits.size());
assertNotNull(appNamespace);
assertEquals(0, childClusters.size());
assertEquals(0, parentNamespaceReleases.size());
assertEquals(0, childNamespaceReleases.size());
assertTrue(!releaseHistories.hasContent());
assertNull(instanceConfig);
}
@Test
@Sql(scripts = "/sql/namespace-test.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/sql/clean.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testGetCommitsByModifiedTime() throws ParseException {
String format = "yyyy-MM-dd HH:mm:ss";
SimpleDateFormat simpleDateFormat = new SimpleDateFormat(format);
Date lastModifiedTime = simpleDateFormat.parse("2020-08-22 09:00:00");
List<Commit> commitsByDate = commitService.find(commitTestApp, testCluster, testPrivateNamespace, lastModifiedTime, null);
Date lastModifiedTimeGreater = simpleDateFormat.parse("2020-08-22 11:00:00");
List<Commit> commitsByDateGreater = commitService.find(commitTestApp, testCluster, testPrivateNamespace, lastModifiedTimeGreater, null);
Date lastModifiedTimePage = simpleDateFormat.parse("2020-08-22 09:30:00");
List<Commit> commitsByDatePage = commitService.find(commitTestApp, testCluster, testPrivateNamespace, lastModifiedTimePage, PageRequest.of(0, 1));
assertEquals(1, commitsByDate.size());
assertEquals(0, commitsByDateGreater.size());
assertEquals(1, commitsByDatePage.size());
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./CHANGES.md | Changes by Version
==================
Release Notes.
Apollo 1.9.0
------------------
* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
* [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
* [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757)
* [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766)
* [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789)
* [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765)
* [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754)
* [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647)
* [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786)
* [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797)
* [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803)
* [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812)
* [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808)
* [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804)
* [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822)
* [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832)
* [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816)
* [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831)
* [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819)
* [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840)
* [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849)
* [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847)
* [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856)
* [fix show-text-modal number display](https://github.com/ctripcorp/apollo/pull/3851)
* [Lazy load ConfigUtil](https://github.com/ctripcorp/apollo/pull/3864)
* [make jdbc session enable default](https://github.com/ctripcorp/apollo/pull/3869)
* [support json/yaml/xml format for public namespace](https://github.com/ctripcorp/apollo/pull/3836)
* [Translate application into 应用 not 项目](https://github.com/ctripcorp/apollo/pull/3877)
* [add spring configuration metadata for property names cache](https://github.com/ctripcorp/apollo/pull/3879)
* [Fix Multiple PropertySourcesPlaceholderConfigurer beans registered issue](https://github.com/ctripcorp/apollo/pull/3865)
* [use jdk 8 to publish apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3880)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| Changes by Version
==================
Release Notes.
Apollo 1.9.0
------------------
* [extend DataChange_CreatedBy, DataChange_LastModifiedBy from 32 to 64.](https://github.com/ctripcorp/apollo/pull/3552)
* [add spring configuration metadata](https://github.com/ctripcorp/apollo/pull/3553)
* [fix #3551 and optimize ldap samples ](https://github.com/ctripcorp/apollo/pull/3561)
* [update wiki url and refine documentation](https://github.com/ctripcorp/apollo/pull/3563)
* [slim docker images](https://github.com/ctripcorp/apollo/pull/3572)
* [add network strategy guideline to docker quick start](https://github.com/ctripcorp/apollo/pull/3574)
* [Added support for consul service discovery](https://github.com/ctripcorp/apollo/pull/3575)
* [disable consul in apollo-assembly by default ](https://github.com/ctripcorp/apollo/pull/3585)
* [ServiceBootstrap unit test fix](https://github.com/ctripcorp/apollo/pull/3593)
* [replace http client implementation with interface ](https://github.com/ctripcorp/apollo/pull/3594)
* [Allow users to inject customized instance via ApolloInjectorCustomizer](https://github.com/ctripcorp/apollo/pull/3602)
* [Fixes #3606](https://github.com/ctripcorp/apollo/pull/3609)
* [Bump xstream from 1.4.15 to 1.4.16](https://github.com/ctripcorp/apollo/pull/3611)
* [docs: user practices. Alibaba Sentinel Dashboard Push Rules to apollo](https://github.com/ctripcorp/apollo/pull/3617)
* [update known users](https://github.com/ctripcorp/apollo/pull/3619)
* [add maven deploy action](https://github.com/ctripcorp/apollo/pull/3620)
* [fix the issue that access key doesn't work if appid passed is in different case](https://github.com/ctripcorp/apollo/pull/3627)
* [fix oidc logout](https://github.com/ctripcorp/apollo/pull/3628)
* [docs: third party sdk nodejs client](https://github.com/ctripcorp/apollo/pull/3632)
* [update known users](https://github.com/ctripcorp/apollo/pull/3633)
* [docs: use docsify pagination plugin](https://github.com/ctripcorp/apollo/pull/3634)
* [apollo client to support jdk16](https://github.com/ctripcorp/apollo/pull/3646)
* [add English version of readme](https://github.com/ctripcorp/apollo/pull/3656)
* [update known users](https://github.com/ctripcorp/apollo/pull/3657)
* [update apolloconfig.com domain](https://github.com/ctripcorp/apollo/pull/3658)
* [localize css to speed up the loading of google fonts](https://github.com/ctripcorp/apollo/pull/3660)
* [test(apollo-client): use assertEquals instead of assertThat](https://github.com/ctripcorp/apollo/pull/3667)
* [test(apollo-client): make timeout more longer when long poll](https://github.com/ctripcorp/apollo/pull/3668)
* [fix unit test](https://github.com/ctripcorp/apollo/pull/3669)
* [解决日志系统未初始化完成时，apollo 的加载日志没法输出问题](https://github.com/ctripcorp/apollo/pull/3677)
* [fix[apollo-configService]: Solve configService startup exception](https://github.com/ctripcorp/apollo/pull/3679)
* [Community Governance Proposal](https://github.com/ctripcorp/apollo/pull/3670)
* [增加阿波罗client的php库](https://github.com/ctripcorp/apollo/pull/3682)
* [Bump xstream from 1.4.16 to 1.4.17](https://github.com/ctripcorp/apollo/pull/3692)
* [Improve the nacos registry configuration document](https://github.com/ctripcorp/apollo/pull/3695)
* [Remove redundant invoke of trySyncFromUpstream](https://github.com/ctripcorp/apollo/pull/3699)
* [add apollo team introduction and community releated contents](https://github.com/ctripcorp/apollo/pull/3713)
* [fix oidc sql](https://github.com/ctripcorp/apollo/pull/3720)
* [feat(apollo-client): add method interestedChangedKeys to ConfigChangeEvent](https://github.com/ctripcorp/apollo/pull/3666)
* [add More... link for known users](https://github.com/ctripcorp/apollo/pull/3757)
* [update OIDC documentation](https://github.com/ctripcorp/apollo/pull/3766)
* [Improve the item-value length limit configuration document](https://github.com/ctripcorp/apollo/pull/3789)
* [Use queue#take instead of poll](https://github.com/ctripcorp/apollo/pull/3765)
* [feature: add Spring Boot 2.4 config data loader support](https://github.com/ctripcorp/apollo/pull/3754)
* [feat(open-api): get authorized apps](https://github.com/ctripcorp/apollo/pull/3647)
* [feature: shared session for multi apollo portal](https://github.com/ctripcorp/apollo/pull/3786)
* [feature: add email for select user on apollo portal](https://github.com/ctripcorp/apollo/pull/3797)
* [feature: modify item comment valid size](https://github.com/ctripcorp/apollo/pull/3803)
* [set default session store-type](https://github.com/ctripcorp/apollo/pull/3812)
* [speed up the stale issue mark and close phase](https://github.com/ctripcorp/apollo/pull/3808)
* [feature: add the delegating password encoder for apollo-portal simple auth](https://github.com/ctripcorp/apollo/pull/3804)
* [support release apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3822)
* [Fix possiable NPE](https://github.com/ctripcorp/apollo/pull/3832)
* [Reduce bootstrap time in the situation with large properties](https://github.com/ctripcorp/apollo/pull/3816)
* [docs: English catalog in sidebar](https://github.com/ctripcorp/apollo/pull/3831)
* [fix the issue that release messages might be missed in certain scenarios](https://github.com/ctripcorp/apollo/pull/3819)
* [use official docker images for manual kubernetes deployment](https://github.com/ctripcorp/apollo/pull/3840)
* [fix size of create project button](https://github.com/ctripcorp/apollo/pull/3849)
* [translation of "portal-how-to-enable-webhook-notification.md"](https://github.com/ctripcorp/apollo/pull/3847)
* [feature: add history detail for not key-value type of namespace](https://github.com/ctripcorp/apollo/pull/3856)
* [fix show-text-modal number display](https://github.com/ctripcorp/apollo/pull/3851)
* [Lazy load ConfigUtil](https://github.com/ctripcorp/apollo/pull/3864)
* [make jdbc session enable default](https://github.com/ctripcorp/apollo/pull/3869)
* [support json/yaml/xml format for public namespace](https://github.com/ctripcorp/apollo/pull/3836)
* [Translate application into 应用 not 项目](https://github.com/ctripcorp/apollo/pull/3877)
* [add spring configuration metadata for property names cache](https://github.com/ctripcorp/apollo/pull/3879)
* [Fix Multiple PropertySourcesPlaceholderConfigurer beans registered issue](https://github.com/ctripcorp/apollo/pull/3865)
* [use jdk 8 to publish apollo-client-config-data](https://github.com/ctripcorp/apollo/pull/3880)
* [fix apollo config data loader with profiles](https://github.com/ctripcorp/apollo/pull/3870)
------------------
All issues and pull requests are [here](https://github.com/ctripcorp/apollo/milestone/6?closed=1)
| 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/extension/webclient/ApolloClientLongPollingExtensionInitializer.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.extension.webclient;
import com.ctrip.framework.apollo.config.data.extension.initialize.ApolloClientExtensionInitializer;
import com.ctrip.framework.apollo.config.data.extension.properties.ApolloClientProperties;
import com.ctrip.framework.apollo.config.data.extension.webclient.customizer.spi.ApolloClientWebClientCustomizerFactory;
import com.ctrip.framework.apollo.config.data.extension.webclient.injector.ApolloClientCustomHttpClientInjectorCustomizer;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import java.util.List;
import org.apache.commons.logging.Log;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.web.reactive.function.client.WebClientCustomizer;
import org.springframework.util.CollectionUtils;
import org.springframework.web.reactive.function.client.WebClient;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloClientLongPollingExtensionInitializer implements
ApolloClientExtensionInitializer {
private final Log log;
private final ConfigurableBootstrapContext bootstrapContext;
public ApolloClientLongPollingExtensionInitializer(Log log,
ConfigurableBootstrapContext bootstrapContext) {
this.log = log;
this.bootstrapContext = bootstrapContext;
}
@Override
public void initialize(ApolloClientProperties apolloClientProperties, Binder binder,
BindHandler bindHandler) {
WebClient.Builder webClientBuilder = WebClient.builder();
List<ApolloClientWebClientCustomizerFactory> factories = ServiceBootstrap
.loadAllOrdered(ApolloClientWebClientCustomizerFactory.class);
if (!CollectionUtils.isEmpty(factories)) {
for (ApolloClientWebClientCustomizerFactory factory : factories) {
WebClientCustomizer webClientCustomizer = factory
.createWebClientCustomizer(apolloClientProperties, binder, bindHandler, this.log,
this.bootstrapContext);
if (webClientCustomizer != null) {
webClientCustomizer.customize(webClientBuilder);
}
}
}
ApolloClientCustomHttpClientInjectorCustomizer.setCustomWebClient(webClientBuilder.build());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.extension.webclient;
import com.ctrip.framework.apollo.config.data.extension.initialize.ApolloClientExtensionInitializer;
import com.ctrip.framework.apollo.config.data.extension.properties.ApolloClientProperties;
import com.ctrip.framework.apollo.config.data.extension.webclient.customizer.spi.ApolloClientWebClientCustomizerFactory;
import com.ctrip.framework.apollo.config.data.injector.ApolloConfigDataInjectorCustomizer;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import java.util.List;
import org.apache.commons.logging.Log;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.web.reactive.function.client.WebClientCustomizer;
import org.springframework.util.CollectionUtils;
import org.springframework.web.reactive.function.client.WebClient;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloClientLongPollingExtensionInitializer implements
ApolloClientExtensionInitializer {
private final Log log;
private final ConfigurableBootstrapContext bootstrapContext;
public ApolloClientLongPollingExtensionInitializer(Log log,
ConfigurableBootstrapContext bootstrapContext) {
this.log = log;
this.bootstrapContext = bootstrapContext;
}
@Override
public void initialize(ApolloClientProperties apolloClientProperties, Binder binder,
BindHandler bindHandler) {
WebClient.Builder webClientBuilder = WebClient.builder();
List<ApolloClientWebClientCustomizerFactory> factories = ServiceBootstrap
.loadAllOrdered(ApolloClientWebClientCustomizerFactory.class);
if (!CollectionUtils.isEmpty(factories)) {
for (ApolloClientWebClientCustomizerFactory factory : factories) {
WebClientCustomizer webClientCustomizer = factory
.createWebClientCustomizer(apolloClientProperties, binder, bindHandler, this.log,
this.bootstrapContext);
if (webClientCustomizer != null) {
webClientCustomizer.customize(webClientBuilder);
}
}
}
HttpClient httpClient = new ApolloWebClientHttpClient(webClientBuilder.build());
ApolloConfigDataInjectorCustomizer.registerIfAbsent(HttpClient.class, () -> httpClient);
}
}
| 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/importer/ApolloConfigDataLoader.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySource;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
import org.springframework.boot.BootstrapRegistry.InstanceSupplier;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.config.ConfigData;
import org.springframework.boot.context.config.ConfigDataLoader;
import org.springframework.boot.context.config.ConfigDataLoaderContext;
import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.core.Ordered;
import org.springframework.core.env.PropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigDataLoader implements ConfigDataLoader<ApolloConfigDataResource>, Ordered {
private final Log log;
public ApolloConfigDataLoader(Log log) {
this.log = log;
}
@Override
public ConfigData load(ConfigDataLoaderContext context, ApolloConfigDataResource resource)
throws IOException, ConfigDataResourceNotFoundException {
ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext();
Binder binder = bootstrapContext.get(Binder.class);
BindHandler bindHandler = this.getBindHandler(context);
bootstrapContext.registerIfAbsent(ApolloConfigDataLoaderInitializer.class, InstanceSupplier
.from(() -> new ApolloConfigDataLoaderInitializer(this.log, binder, bindHandler,
bootstrapContext)));
ApolloConfigDataLoaderInitializer apolloConfigDataLoaderInitializer = bootstrapContext
.get(ApolloConfigDataLoaderInitializer.class);
// init apollo client
List<PropertySource<?>> initialPropertySourceList = apolloConfigDataLoaderInitializer
.initApolloClient();
// load config
bootstrapContext.registerIfAbsent(ConfigPropertySourceFactory.class,
InstanceSupplier.from(() -> SpringInjector.getInstance(ConfigPropertySourceFactory.class)));
ConfigPropertySourceFactory configPropertySourceFactory = bootstrapContext
.get(ConfigPropertySourceFactory.class);
String namespace = resource.getNamespace();
Config config = ConfigService.getConfig(namespace);
ConfigPropertySource configPropertySource = configPropertySourceFactory
.getConfigPropertySource(namespace, config);
List<PropertySource<?>> propertySourceList = new ArrayList<>();
propertySourceList.add(configPropertySource);
propertySourceList.addAll(initialPropertySourceList);
log.debug(Slf4jLogMessageFormatter
.format("apollo client loaded namespace [{}]", resource.getNamespace()));
return new ConfigData(propertySourceList);
}
private BindHandler getBindHandler(ConfigDataLoaderContext context) {
return context.getBootstrapContext().getOrElse(BindHandler.class, null);
}
@Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE + 100;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySource;
import com.ctrip.framework.apollo.spring.config.ConfigPropertySourceFactory;
import com.ctrip.framework.apollo.spring.util.SpringInjector;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
import org.springframework.boot.BootstrapRegistry.InstanceSupplier;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.config.ConfigData;
import org.springframework.boot.context.config.ConfigDataLoader;
import org.springframework.boot.context.config.ConfigDataLoaderContext;
import org.springframework.boot.context.config.ConfigDataResourceNotFoundException;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.core.Ordered;
import org.springframework.core.env.PropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigDataLoader implements ConfigDataLoader<ApolloConfigDataResource>, Ordered {
private final Log log;
public ApolloConfigDataLoader(Log log) {
this.log = log;
}
@Override
public ConfigData load(ConfigDataLoaderContext context, ApolloConfigDataResource resource)
throws IOException, ConfigDataResourceNotFoundException {
ConfigurableBootstrapContext bootstrapContext = context.getBootstrapContext();
Binder binder = bootstrapContext.get(Binder.class);
BindHandler bindHandler = this.getBindHandler(context);
bootstrapContext.registerIfAbsent(ApolloConfigDataLoaderInitializer.class, InstanceSupplier
.from(() -> new ApolloConfigDataLoaderInitializer(this.log, binder, bindHandler,
bootstrapContext)));
ApolloConfigDataLoaderInitializer apolloConfigDataLoaderInitializer = bootstrapContext
.get(ApolloConfigDataLoaderInitializer.class);
// init apollo client
List<PropertySource<?>> initialPropertySourceList = apolloConfigDataLoaderInitializer
.initApolloClient();
// load config
bootstrapContext.registerIfAbsent(ConfigPropertySourceFactory.class,
InstanceSupplier.from(() -> SpringInjector.getInstance(ConfigPropertySourceFactory.class)));
ConfigPropertySourceFactory configPropertySourceFactory = bootstrapContext
.get(ConfigPropertySourceFactory.class);
String namespace = resource.getNamespace();
Config config = ConfigService.getConfig(namespace);
ConfigPropertySource configPropertySource = configPropertySourceFactory
.getConfigPropertySource(namespace, config);
List<PropertySource<?>> propertySourceList = new ArrayList<>();
propertySourceList.add(configPropertySource);
propertySourceList.addAll(initialPropertySourceList);
log.debug(Slf4jLogMessageFormatter.format("apollo client loaded namespace [{}]", namespace));
return new ConfigData(propertySourceList);
}
private BindHandler getBindHandler(ConfigDataLoaderContext context) {
return context.getBootstrapContext().getOrElse(BindHandler.class, null);
}
@Override
public int getOrder() {
return Ordered.HIGHEST_PRECEDENCE + 100;
}
}
| 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/importer/ApolloConfigDataLoaderInitializer.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.config.data.extension.initialize.ApolloClientExtensionInitializeFactory;
import com.ctrip.framework.apollo.config.data.system.ApolloClientSystemPropertyInitializer;
import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter;
import com.ctrip.framework.apollo.core.utils.DeferredLogger;
import com.ctrip.framework.apollo.spring.config.PropertySourcesConstants;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
class ApolloConfigDataLoaderInitializer {
private static volatile boolean INITIALIZED = false;
private final Log log;
private final Binder binder;
private final BindHandler bindHandler;
private final ConfigurableBootstrapContext bootstrapContext;
public ApolloConfigDataLoaderInitializer(Log log,
Binder binder, BindHandler bindHandler,
ConfigurableBootstrapContext bootstrapContext) {
this.log = log;
this.binder = binder;
this.bindHandler = bindHandler;
this.bootstrapContext = bootstrapContext;
}
/**
* init apollo client (only once)
*
* @return initial sources as placeholders or empty list if already initialized
*/
public List<PropertySource<?>> initApolloClient() {
if (INITIALIZED) {
return Collections.emptyList();
}
synchronized (ApolloConfigDataLoaderInitializer.class) {
if (INITIALIZED) {
return Collections.emptyList();
}
this.initApolloClientInternal();
INITIALIZED = true;
if (this.forceDisableApolloBootstrap()) {
// force disable apollo bootstrap to avoid conflict
Map<String, Object> map = new HashMap<>();
map.put(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "false");
map.put(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED, "false");
// provide initial sources as placeholders to avoid duplicate loading
return Arrays.asList(
new ApolloConfigEmptyPropertySource(
PropertySourcesConstants.APOLLO_PROPERTY_SOURCE_NAME),
new MapPropertySource(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME,
Collections.unmodifiableMap(map)));
}
// provide initial sources as placeholders to avoid duplicate loading
return Arrays.asList(
new ApolloConfigEmptyPropertySource(PropertySourcesConstants.APOLLO_PROPERTY_SOURCE_NAME),
new ApolloConfigEmptyPropertySource(
PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME));
}
}
private void initApolloClientInternal() {
new ApolloClientSystemPropertyInitializer(this.log)
.initializeSystemProperty(this.binder, this.bindHandler);
new ApolloClientExtensionInitializeFactory(this.log,
this.bootstrapContext).initializeExtension(this.binder, this.bindHandler);
DeferredLogger.enable();
}
private boolean forceDisableApolloBootstrap() {
boolean bootstrapEnabled = this.binder
.bind(this.camelCasedToKebabCase(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED),
Bindable.of(Boolean.class),
this.bindHandler)
.orElse(false);
if (bootstrapEnabled) {
this.log.warn(Slf4jLogMessageFormatter.format(
"apollo bootstrap is force disabled. please don't configure the property [{}=true] and [spring.config.import=apollo://...] at the same time",
PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED));
return true;
}
boolean bootstrapEagerLoadEnabled = this.binder
.bind(this.camelCasedToKebabCase(
PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED),
Bindable.of(Boolean.class),
this.bindHandler)
.orElse(false);
if (bootstrapEagerLoadEnabled) {
this.log.warn(Slf4jLogMessageFormatter.format(
"apollo bootstrap eager load is force disabled. please don't configure the property [{}=true] and [spring.config.import=apollo://...] at the same time",
PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED));
return true;
}
return false;
}
/**
* {@link ConfigurationPropertyName#isValid(java.lang.CharSequence)}
*
* @param source origin propertyName
* @return valid propertyName
*/
private String camelCasedToKebabCase(String source) {
if (ConfigurationPropertyName.isValid(source)) {
return source;
}
StringBuilder stringBuilder = new StringBuilder(source.length() * 2);
for (char ch : source.toCharArray()) {
if (Character.isUpperCase(ch)) {
stringBuilder.append("-").append(Character.toLowerCase(ch));
continue;
}
stringBuilder.append(ch);
}
return stringBuilder.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.config.data.extension.initialize.ApolloClientExtensionInitializeFactory;
import com.ctrip.framework.apollo.config.data.injector.ApolloConfigDataInjectorCustomizer;
import com.ctrip.framework.apollo.config.data.internals.PureApolloConfigFactory;
import com.ctrip.framework.apollo.config.data.system.ApolloClientSystemPropertyInitializer;
import com.ctrip.framework.apollo.config.data.util.Slf4jLogMessageFormatter;
import com.ctrip.framework.apollo.core.utils.DeferredLogger;
import com.ctrip.framework.apollo.spi.ConfigFactory;
import com.ctrip.framework.apollo.spring.config.PropertySourcesConstants;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.springframework.boot.ConfigurableBootstrapContext;
import org.springframework.boot.context.properties.bind.BindHandler;
import org.springframework.boot.context.properties.bind.Bindable;
import org.springframework.boot.context.properties.bind.Binder;
import org.springframework.boot.context.properties.source.ConfigurationPropertyName;
import org.springframework.core.env.MapPropertySource;
import org.springframework.core.env.PropertySource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
class ApolloConfigDataLoaderInitializer {
private static volatile boolean INITIALIZED = false;
private final Log log;
private final Binder binder;
private final BindHandler bindHandler;
private final ConfigurableBootstrapContext bootstrapContext;
public ApolloConfigDataLoaderInitializer(Log log,
Binder binder, BindHandler bindHandler,
ConfigurableBootstrapContext bootstrapContext) {
this.log = log;
this.binder = binder;
this.bindHandler = bindHandler;
this.bootstrapContext = bootstrapContext;
}
/**
* init apollo client (only once)
*
* @return initial sources as placeholders or empty list if already initialized
*/
public List<PropertySource<?>> initApolloClient() {
if (INITIALIZED) {
return Collections.emptyList();
}
synchronized (ApolloConfigDataLoaderInitializer.class) {
if (INITIALIZED) {
return Collections.emptyList();
}
this.initApolloClientInternal();
INITIALIZED = true;
if (this.forceDisableApolloBootstrap()) {
// force disable apollo bootstrap to avoid conflict
Map<String, Object> map = new HashMap<>();
map.put(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED, "false");
map.put(PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED, "false");
// provide initial sources as placeholders to avoid duplicate loading
return Arrays.asList(
new ApolloConfigEmptyPropertySource(
PropertySourcesConstants.APOLLO_PROPERTY_SOURCE_NAME),
new MapPropertySource(PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME,
Collections.unmodifiableMap(map)));
}
// provide initial sources as placeholders to avoid duplicate loading
return Arrays.asList(
new ApolloConfigEmptyPropertySource(PropertySourcesConstants.APOLLO_PROPERTY_SOURCE_NAME),
new ApolloConfigEmptyPropertySource(
PropertySourcesConstants.APOLLO_BOOTSTRAP_PROPERTY_SOURCE_NAME));
}
}
private void initApolloClientInternal() {
new ApolloClientSystemPropertyInitializer(this.log)
.initializeSystemProperty(this.binder, this.bindHandler);
new ApolloClientExtensionInitializeFactory(this.log,
this.bootstrapContext).initializeExtension(this.binder, this.bindHandler);
DeferredLogger.enable();
ApolloConfigDataInjectorCustomizer.register(ConfigFactory.class,
PureApolloConfigFactory::new);
}
private boolean forceDisableApolloBootstrap() {
boolean bootstrapEnabled = this.binder
.bind(this.camelCasedToKebabCase(PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED),
Bindable.of(Boolean.class),
this.bindHandler)
.orElse(false);
if (bootstrapEnabled) {
this.log.warn(Slf4jLogMessageFormatter.format(
"apollo bootstrap is force disabled. please don't configure the property [{}=true] and [spring.config.import=apollo://...] at the same time",
PropertySourcesConstants.APOLLO_BOOTSTRAP_ENABLED));
return true;
}
boolean bootstrapEagerLoadEnabled = this.binder
.bind(this.camelCasedToKebabCase(
PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED),
Bindable.of(Boolean.class),
this.bindHandler)
.orElse(false);
if (bootstrapEagerLoadEnabled) {
this.log.warn(Slf4jLogMessageFormatter.format(
"apollo bootstrap eager load is force disabled. please don't configure the property [{}=true] and [spring.config.import=apollo://...] at the same time",
PropertySourcesConstants.APOLLO_BOOTSTRAP_EAGER_LOAD_ENABLED));
return true;
}
return false;
}
/**
* {@link ConfigurationPropertyName#isValid(java.lang.CharSequence)}
*
* @param source origin propertyName
* @return valid propertyName
*/
private String camelCasedToKebabCase(String source) {
if (ConfigurationPropertyName.isValid(source)) {
return source;
}
StringBuilder stringBuilder = new StringBuilder(source.length() * 2);
for (char ch : source.toCharArray()) {
if (Character.isUpperCase(ch)) {
stringBuilder.append("-").append(Character.toLowerCase(ch));
continue;
}
stringBuilder.append(ch);
}
return stringBuilder.toString();
}
}
| 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/resources/META-INF/services/com.ctrip.framework.apollo.spi.ApolloInjectorCustomizer | com.ctrip.framework.apollo.config.data.extension.webclient.injector.ApolloClientCustomHttpClientInjectorCustomizer | com.ctrip.framework.apollo.config.data.injector.ApolloConfigDataInjectorCustomizer | 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.RateLimiter;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = DeferredLoggerFactory.getLogger(DefaultConfig.class);
private final String m_namespace;
private final Properties m_resourceProperties;
private final AtomicReference<Properties> m_configProperties;
private final ConfigRepository m_configRepository;
private final RateLimiter m_warnLogRateLimiter;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace of this config instance
* @param configRepository the config repository for this config instance
*/
public DefaultConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_resourceProperties = loadFromResource(m_namespace);
m_configRepository = configRepository;
m_configProperties = new AtomicReference<>();
m_warnLogRateLimiter = RateLimiter.create(0.017); // 1 warning log output per minute
initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Local Config failed - namespace: {}, reason: {}.",
m_namespace, ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
@Override
public String getProperty(String key, String defaultValue) {
// step 1: check system properties, i.e. -Dkey=value
String value = System.getProperty(key);
// step 2: check local cached properties file
if (value == null && m_configProperties.get() != null) {
value = m_configProperties.get().getProperty(key);
}
/**
* step 3: check env variable, i.e. PATH=...
* normally system environment variables are in UPPERCASE, however there might be exceptions.
* so the caller should provide the key in the right case
*/
if (value == null) {
value = System.getenv(key);
}
// step 4: check properties file from classpath
if (value == null && m_resourceProperties != null) {
value = m_resourceProperties.getProperty(key);
}
if (value == null && m_configProperties.get() == null && m_warnLogRateLimiter.tryAcquire()) {
logger.warn(
"Could not load config for namespace {} from Apollo, please check whether the configs are released in Apollo! Return default value now!",
m_namespace);
}
return value == null ? defaultValue : value;
}
@Override
public Set<String> getPropertyNames() {
Properties properties = m_configProperties.get();
if (properties == null) {
return Collections.emptySet();
}
return stringPropertyNames(properties);
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
private Set<String> stringPropertyNames(Properties properties) {
//jdk9以下版本Properties#enumerateStringProperties方法存在性能问题，keys() + get(k) 重复迭代, jdk9之后改为entrySet遍历.
Map<String, String> h = new LinkedHashMap<>();
for (Map.Entry<Object, Object> e : properties.entrySet()) {
Object k = e.getKey();
Object v = e.getValue();
if (k instanceof String && v instanceof String) {
h.put((String) k, (String) v);
}
}
return h.keySet();
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties.get())) {
return;
}
ConfigSourceType sourceType = m_configRepository.getSourceType();
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
Map<String, ConfigChange> actualChanges = updateAndCalcConfigChanges(newConfigProperties,
sourceType);
//check double checked result
if (actualChanges.isEmpty()) {
return;
}
this.fireConfigChange(m_namespace, actualChanges);
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties.set(newConfigProperties);
m_sourceType = sourceType;
}
private Map<String, ConfigChange> updateAndCalcConfigChanges(Properties newConfigProperties,
ConfigSourceType sourceType) {
List<ConfigChange> configChanges =
calcPropertyChanges(m_namespace, m_configProperties.get(), newConfigProperties);
ImmutableMap.Builder<String, ConfigChange> actualChanges =
new ImmutableMap.Builder<>();
/** === Double check since DefaultConfig has multiple config sources ==== **/
//1. use getProperty to update configChanges's old value
for (ConfigChange change : configChanges) {
change.setOldValue(this.getProperty(change.getPropertyName(), change.getOldValue()));
}
//2. update m_configProperties
updateConfig(newConfigProperties, sourceType);
clearConfigCache();
//3. use getProperty to update configChange's new value and calc the final changes
for (ConfigChange change : configChanges) {
change.setNewValue(this.getProperty(change.getPropertyName(), change.getNewValue()));
switch (change.getChangeType()) {
case ADDED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getOldValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
case MODIFIED:
if (!Objects.equals(change.getOldValue(), change.getNewValue())) {
actualChanges.put(change.getPropertyName(), change);
}
break;
case DELETED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getNewValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
default:
//do nothing
break;
}
}
return actualChanges.build();
}
private Properties loadFromResource(String namespace) {
String name = String.format("META-INF/config/%s.properties", namespace);
InputStream in = ClassLoaderUtil.getLoader().getResourceAsStream(name);
Properties properties = null;
if (in != null) {
properties = propertiesFactory.getPropertiesInstance();
try {
properties.load(in);
} catch (IOException ex) {
Tracer.logError(ex);
logger.error("Load resource config for namespace {} failed", namespace, ex);
} finally {
try {
in.close();
} catch (IOException ex) {
// ignore
}
}
}
return properties;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.slf4j.Logger;
import com.ctrip.framework.apollo.core.utils.ClassLoaderUtil;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
import com.ctrip.framework.apollo.model.ConfigChange;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.ctrip.framework.apollo.util.ExceptionUtil;
import com.google.common.collect.ImmutableMap;
import com.google.common.util.concurrent.RateLimiter;
import org.springframework.util.CollectionUtils;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfig extends AbstractConfig implements RepositoryChangeListener {
private static final Logger logger = DeferredLoggerFactory.getLogger(DefaultConfig.class);
private final String m_namespace;
private final Properties m_resourceProperties;
private final AtomicReference<Properties> m_configProperties;
private final ConfigRepository m_configRepository;
private final RateLimiter m_warnLogRateLimiter;
private volatile ConfigSourceType m_sourceType = ConfigSourceType.NONE;
/**
* Constructor.
*
* @param namespace the namespace of this config instance
* @param configRepository the config repository for this config instance
*/
public DefaultConfig(String namespace, ConfigRepository configRepository) {
m_namespace = namespace;
m_resourceProperties = loadFromResource(m_namespace);
m_configRepository = configRepository;
m_configProperties = new AtomicReference<>();
m_warnLogRateLimiter = RateLimiter.create(0.017); // 1 warning log output per minute
initialize();
}
private void initialize() {
try {
updateConfig(m_configRepository.getConfig(), m_configRepository.getSourceType());
} catch (Throwable ex) {
Tracer.logError(ex);
logger.warn("Init Apollo Local Config failed - namespace: {}, reason: {}.",
m_namespace, ExceptionUtil.getDetailMessage(ex));
} finally {
//register the change listener no matter config repository is working or not
//so that whenever config repository is recovered, config could get changed
m_configRepository.addChangeListener(this);
}
}
/**
* get property from cached repository properties file
*
* @param key property key
* @return value
*/
protected String getPropertyFromRepository(String key) {
Properties properties = m_configProperties.get();
if (properties != null) {
return properties.getProperty(key);
}
return null;
}
/**
* get property from additional properties file on classpath
*
* @param key property key
* @return value
*/
protected String getPropertyFromAdditional(String key) {
Properties properties = this.m_resourceProperties;
if (properties != null) {
return properties.getProperty(key);
}
return null;
}
/**
* try to print a warn log when can not find a property
*
* @param value value
*/
protected void tryWarnLog(String value) {
if (value == null && m_configProperties.get() == null && m_warnLogRateLimiter.tryAcquire()) {
logger.warn(
"Could not load config for namespace {} from Apollo, please check whether the configs are released in Apollo! Return default value now!",
m_namespace);
}
}
/**
* get property names from cached repository properties file
*
* @return property names
*/
protected Set<String> getPropertyNamesFromRepository() {
Properties properties = m_configProperties.get();
if (properties == null) {
return Collections.emptySet();
}
return this.stringPropertyNames(properties);
}
/**
* get property names from additional properties file on classpath
*
* @return property names
*/
protected Set<String> getPropertyNamesFromAdditional() {
Properties properties = m_resourceProperties;
if (properties == null) {
return Collections.emptySet();
}
return this.stringPropertyNames(properties);
}
@Override
public String getProperty(String key, String defaultValue) {
// step 1: check system properties, i.e. -Dkey=value
String value = System.getProperty(key);
// step 2: check local cached properties file
if (value == null) {
value = this.getPropertyFromRepository(key);
}
/*
* step 3: check env variable, i.e. PATH=...
* normally system environment variables are in UPPERCASE, however there might be exceptions.
* so the caller should provide the key in the right case
*/
if (value == null) {
value = System.getenv(key);
}
// step 4: check properties file from classpath
if (value == null) {
value = this.getPropertyFromAdditional(key);
}
this.tryWarnLog(value);
return value == null ? defaultValue : value;
}
@Override
public Set<String> getPropertyNames() {
// propertyNames include system property and system env might cause some compatibility issues, though that looks like the correct implementation.
Set<String> fromRepository = this.getPropertyNamesFromRepository();
Set<String> fromAdditional = this.getPropertyNamesFromAdditional();
if (CollectionUtils.isEmpty(fromRepository)) {
return fromAdditional;
}
if (CollectionUtils.isEmpty(fromAdditional)) {
return fromRepository;
}
Set<String> propertyNames = Sets
.newLinkedHashSetWithExpectedSize(fromRepository.size() + fromAdditional.size());
propertyNames.addAll(fromRepository);
propertyNames.addAll(fromAdditional);
return propertyNames;
}
@Override
public ConfigSourceType getSourceType() {
return m_sourceType;
}
private Set<String> stringPropertyNames(Properties properties) {
//jdk9以下版本Properties#enumerateStringProperties方法存在性能问题，keys() + get(k) 重复迭代, jdk9之后改为entrySet遍历.
Map<String, String> h = Maps.newLinkedHashMapWithExpectedSize(properties.size());
for (Map.Entry<Object, Object> e : properties.entrySet()) {
Object k = e.getKey();
Object v = e.getValue();
if (k instanceof String && v instanceof String) {
h.put((String) k, (String) v);
}
}
return h.keySet();
}
@Override
public synchronized void onRepositoryChange(String namespace, Properties newProperties) {
if (newProperties.equals(m_configProperties.get())) {
return;
}
ConfigSourceType sourceType = m_configRepository.getSourceType();
Properties newConfigProperties = propertiesFactory.getPropertiesInstance();
newConfigProperties.putAll(newProperties);
Map<String, ConfigChange> actualChanges = updateAndCalcConfigChanges(newConfigProperties,
sourceType);
//check double checked result
if (actualChanges.isEmpty()) {
return;
}
this.fireConfigChange(m_namespace, actualChanges);
Tracer.logEvent("Apollo.Client.ConfigChanges", m_namespace);
}
private void updateConfig(Properties newConfigProperties, ConfigSourceType sourceType) {
m_configProperties.set(newConfigProperties);
m_sourceType = sourceType;
}
private Map<String, ConfigChange> updateAndCalcConfigChanges(Properties newConfigProperties,
ConfigSourceType sourceType) {
List<ConfigChange> configChanges =
calcPropertyChanges(m_namespace, m_configProperties.get(), newConfigProperties);
ImmutableMap.Builder<String, ConfigChange> actualChanges =
new ImmutableMap.Builder<>();
/** === Double check since DefaultConfig has multiple config sources ==== **/
//1. use getProperty to update configChanges's old value
for (ConfigChange change : configChanges) {
change.setOldValue(this.getProperty(change.getPropertyName(), change.getOldValue()));
}
//2. update m_configProperties
updateConfig(newConfigProperties, sourceType);
clearConfigCache();
//3. use getProperty to update configChange's new value and calc the final changes
for (ConfigChange change : configChanges) {
change.setNewValue(this.getProperty(change.getPropertyName(), change.getNewValue()));
switch (change.getChangeType()) {
case ADDED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getOldValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
case MODIFIED:
if (!Objects.equals(change.getOldValue(), change.getNewValue())) {
actualChanges.put(change.getPropertyName(), change);
}
break;
case DELETED:
if (Objects.equals(change.getOldValue(), change.getNewValue())) {
break;
}
if (change.getNewValue() != null) {
change.setChangeType(PropertyChangeType.MODIFIED);
}
actualChanges.put(change.getPropertyName(), change);
break;
default:
//do nothing
break;
}
}
return actualChanges.build();
}
private Properties loadFromResource(String namespace) {
String name = String.format("META-INF/config/%s.properties", namespace);
InputStream in = ClassLoaderUtil.getLoader().getResourceAsStream(name);
Properties properties = null;
if (in != null) {
properties = propertiesFactory.getPropertiesInstance();
try {
properties.load(in);
} catch (IOException ex) {
Tracer.logError(ex);
logger.error("Load resource config for namespace {} failed", namespace, ex);
} finally {
try {
in.close();
} catch (IOException ex) {
// ignore
}
}
}
return properties;
}
}
| 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spi/DefaultConfigFactory.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.internals.PropertiesCompatibleFileConfigRepository;
import com.ctrip.framework.apollo.internals.TxtConfigFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.internals.ConfigRepository;
import com.ctrip.framework.apollo.internals.DefaultConfig;
import com.ctrip.framework.apollo.internals.JsonConfigFile;
import com.ctrip.framework.apollo.internals.LocalFileConfigRepository;
import com.ctrip.framework.apollo.internals.PropertiesConfigFile;
import com.ctrip.framework.apollo.internals.RemoteConfigRepository;
import com.ctrip.framework.apollo.internals.XmlConfigFile;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.internals.YmlConfigFile;
import com.ctrip.framework.apollo.util.ConfigUtil;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigFactory implements ConfigFactory {
private static final Logger logger = LoggerFactory.getLogger(DefaultConfigFactory.class);
private ConfigUtil m_configUtil;
public DefaultConfigFactory() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
}
@Override
public Config create(String namespace) {
ConfigFileFormat format = determineFileFormat(namespace);
if (ConfigFileFormat.isPropertiesCompatible(format)) {
return new DefaultConfig(namespace, createPropertiesCompatibleFileConfigRepository(namespace, format));
}
return new DefaultConfig(namespace, createLocalConfigRepository(namespace));
}
@Override
public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) {
ConfigRepository configRepository = createLocalConfigRepository(namespace);
switch (configFileFormat) {
case Properties:
return new PropertiesConfigFile(namespace, configRepository);
case XML:
return new XmlConfigFile(namespace, configRepository);
case JSON:
return new JsonConfigFile(namespace, configRepository);
case YAML:
return new YamlConfigFile(namespace, configRepository);
case YML:
return new YmlConfigFile(namespace, configRepository);
case TXT:
return new TxtConfigFile(namespace, configRepository);
}
return null;
}
LocalFileConfigRepository createLocalConfigRepository(String namespace) {
if (m_configUtil.isInLocalMode()) {
logger.warn(
"==== Apollo is in local mode! Won't pull configs from remote server for namespace {} ! ====",
namespace);
return new LocalFileConfigRepository(namespace);
}
return new LocalFileConfigRepository(namespace, createRemoteConfigRepository(namespace));
}
RemoteConfigRepository createRemoteConfigRepository(String namespace) {
return new RemoteConfigRepository(namespace);
}
PropertiesCompatibleFileConfigRepository createPropertiesCompatibleFileConfigRepository(String namespace,
ConfigFileFormat format) {
String actualNamespaceName = trimNamespaceFormat(namespace, format);
PropertiesCompatibleConfigFile configFile = (PropertiesCompatibleConfigFile) ConfigService
.getConfigFile(actualNamespaceName, format);
return new PropertiesCompatibleFileConfigRepository(configFile);
}
// for namespaces whose format are not properties, the file extension must be present, e.g. application.yaml
ConfigFileFormat determineFileFormat(String namespaceName) {
String lowerCase = namespaceName.toLowerCase();
for (ConfigFileFormat format : ConfigFileFormat.values()) {
if (lowerCase.endsWith("." + format.getValue())) {
return format;
}
}
return ConfigFileFormat.Properties;
}
String trimNamespaceFormat(String namespaceName, ConfigFileFormat format) {
String extension = "." + format.getValue();
if (!namespaceName.toLowerCase().endsWith(extension)) {
return namespaceName;
}
return namespaceName.substring(0, namespaceName.length() - extension.length());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spi;
import com.ctrip.framework.apollo.ConfigService;
import com.ctrip.framework.apollo.PropertiesCompatibleConfigFile;
import com.ctrip.framework.apollo.internals.PropertiesCompatibleFileConfigRepository;
import com.ctrip.framework.apollo.internals.TxtConfigFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.ctrip.framework.apollo.Config;
import com.ctrip.framework.apollo.ConfigFile;
import com.ctrip.framework.apollo.build.ApolloInjector;
import com.ctrip.framework.apollo.core.enums.ConfigFileFormat;
import com.ctrip.framework.apollo.internals.ConfigRepository;
import com.ctrip.framework.apollo.internals.DefaultConfig;
import com.ctrip.framework.apollo.internals.JsonConfigFile;
import com.ctrip.framework.apollo.internals.LocalFileConfigRepository;
import com.ctrip.framework.apollo.internals.PropertiesConfigFile;
import com.ctrip.framework.apollo.internals.RemoteConfigRepository;
import com.ctrip.framework.apollo.internals.XmlConfigFile;
import com.ctrip.framework.apollo.internals.YamlConfigFile;
import com.ctrip.framework.apollo.internals.YmlConfigFile;
import com.ctrip.framework.apollo.util.ConfigUtil;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class DefaultConfigFactory implements ConfigFactory {
private static final Logger logger = LoggerFactory.getLogger(DefaultConfigFactory.class);
private final ConfigUtil m_configUtil;
public DefaultConfigFactory() {
m_configUtil = ApolloInjector.getInstance(ConfigUtil.class);
}
@Override
public Config create(String namespace) {
ConfigFileFormat format = determineFileFormat(namespace);
if (ConfigFileFormat.isPropertiesCompatible(format)) {
return this.createRepositoryConfig(namespace, createPropertiesCompatibleFileConfigRepository(namespace, format));
}
return this.createRepositoryConfig(namespace, createLocalConfigRepository(namespace));
}
protected Config createRepositoryConfig(String namespace, ConfigRepository configRepository) {
return new DefaultConfig(namespace, configRepository);
}
@Override
public ConfigFile createConfigFile(String namespace, ConfigFileFormat configFileFormat) {
ConfigRepository configRepository = createLocalConfigRepository(namespace);
switch (configFileFormat) {
case Properties:
return new PropertiesConfigFile(namespace, configRepository);
case XML:
return new XmlConfigFile(namespace, configRepository);
case JSON:
return new JsonConfigFile(namespace, configRepository);
case YAML:
return new YamlConfigFile(namespace, configRepository);
case YML:
return new YmlConfigFile(namespace, configRepository);
case TXT:
return new TxtConfigFile(namespace, configRepository);
}
return null;
}
LocalFileConfigRepository createLocalConfigRepository(String namespace) {
if (m_configUtil.isInLocalMode()) {
logger.warn(
"==== Apollo is in local mode! Won't pull configs from remote server for namespace {} ! ====",
namespace);
return new LocalFileConfigRepository(namespace);
}
return new LocalFileConfigRepository(namespace, createRemoteConfigRepository(namespace));
}
RemoteConfigRepository createRemoteConfigRepository(String namespace) {
return new RemoteConfigRepository(namespace);
}
PropertiesCompatibleFileConfigRepository createPropertiesCompatibleFileConfigRepository(String namespace,
ConfigFileFormat format) {
String actualNamespaceName = trimNamespaceFormat(namespace, format);
PropertiesCompatibleConfigFile configFile = (PropertiesCompatibleConfigFile) ConfigService
.getConfigFile(actualNamespaceName, format);
return new PropertiesCompatibleFileConfigRepository(configFile);
}
// for namespaces whose format are not properties, the file extension must be present, e.g. application.yaml
ConfigFileFormat determineFileFormat(String namespaceName) {
String lowerCase = namespaceName.toLowerCase();
for (ConfigFileFormat format : ConfigFileFormat.values()) {
if (lowerCase.endsWith("." + format.getValue())) {
return format;
}
}
return ConfigFileFormat.Properties;
}
String trimNamespaceFormat(String namespaceName, ConfigFileFormat format) {
String extension = "." + format.getValue();
if (!namespaceName.toLowerCase().endsWith(extension)) {
return namespaceName;
}
return namespaceName.substring(0, namespaceName.length() - extension.length());
}
}
| 1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/constant/RoleType.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.constant;
public class RoleType {
public static final String MASTER = "Master";
public static final String MODIFY_NAMESPACE = "ModifyNamespace";
public static final String RELEASE_NAMESPACE = "ReleaseNamespace";
public static boolean isValidRoleType(String roleType) {
return MASTER.equals(roleType) || MODIFY_NAMESPACE.equals(roleType) || RELEASE_NAMESPACE.equals(roleType);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.constant;
public class RoleType {
public static final String MASTER = "Master";
public static final String MODIFY_NAMESPACE = "ModifyNamespace";
public static final String RELEASE_NAMESPACE = "ReleaseNamespace";
public static boolean isValidRoleType(String roleType) {
return MASTER.equals(roleType) || MODIFY_NAMESPACE.equals(roleType) || RELEASE_NAMESPACE.equals(roleType);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/model/ConfigChange.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.model;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
/**
* Holds the information for a config change.
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigChange {
private final String namespace;
private final String propertyName;
private String oldValue;
private String newValue;
private PropertyChangeType changeType;
/**
* Constructor.
* @param namespace the namespace of the key
* @param propertyName the key whose value is changed
* @param oldValue the value before change
* @param newValue the value after change
* @param changeType the change type
*/
public ConfigChange(String namespace, String propertyName, String oldValue, String newValue,
PropertyChangeType changeType) {
this.namespace = namespace;
this.propertyName = propertyName;
this.oldValue = oldValue;
this.newValue = newValue;
this.changeType = changeType;
}
public String getPropertyName() {
return propertyName;
}
public String getOldValue() {
return oldValue;
}
public String getNewValue() {
return newValue;
}
public PropertyChangeType getChangeType() {
return changeType;
}
public void setOldValue(String oldValue) {
this.oldValue = oldValue;
}
public void setNewValue(String newValue) {
this.newValue = newValue;
}
public void setChangeType(PropertyChangeType changeType) {
this.changeType = changeType;
}
public String getNamespace() {
return namespace;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("ConfigChange{");
sb.append("namespace='").append(namespace).append('\'');
sb.append(", propertyName='").append(propertyName).append('\'');
sb.append(", oldValue='").append(oldValue).append('\'');
sb.append(", newValue='").append(newValue).append('\'');
sb.append(", changeType=").append(changeType);
sb.append('}');
return sb.toString();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.model;
import com.ctrip.framework.apollo.enums.PropertyChangeType;
/**
* Holds the information for a config change.
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigChange {
private final String namespace;
private final String propertyName;
private String oldValue;
private String newValue;
private PropertyChangeType changeType;
/**
* Constructor.
* @param namespace the namespace of the key
* @param propertyName the key whose value is changed
* @param oldValue the value before change
* @param newValue the value after change
* @param changeType the change type
*/
public ConfigChange(String namespace, String propertyName, String oldValue, String newValue,
PropertyChangeType changeType) {
this.namespace = namespace;
this.propertyName = propertyName;
this.oldValue = oldValue;
this.newValue = newValue;
this.changeType = changeType;
}
public String getPropertyName() {
return propertyName;
}
public String getOldValue() {
return oldValue;
}
public String getNewValue() {
return newValue;
}
public PropertyChangeType getChangeType() {
return changeType;
}
public void setOldValue(String oldValue) {
this.oldValue = oldValue;
}
public void setNewValue(String newValue) {
this.newValue = newValue;
}
public void setChangeType(PropertyChangeType changeType) {
this.changeType = changeType;
}
public String getNamespace() {
return namespace;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("ConfigChange{");
sb.append("namespace='").append(namespace).append('\'');
sb.append(", propertyName='").append(propertyName).append('\'');
sb.append(", oldValue='").append(oldValue).append('\'');
sb.append(", newValue='").append(newValue).append('\'');
sb.append(", changeType=").append(changeType);
sb.append('}');
return sb.toString();
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/en/misc/apollo-benchmark.md | TODO
| TODO
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/openapi/repository/ConsumerTokenRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerTokenRepository extends PagingAndSortingRepository<ConsumerToken, Long> {
/**
* find consumer token by token
*
* @param token the token
* @param validDate the date when the token is valid
*/
ConsumerToken findTopByTokenAndExpiresAfter(String token, Date validDate);
ConsumerToken findByConsumerId(Long consumerId);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.repository;
import com.ctrip.framework.apollo.openapi.entity.ConsumerToken;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ConsumerTokenRepository extends PagingAndSortingRepository<ConsumerToken, Long> {
/**
* find consumer token by token
*
* @param token the token
* @param validDate the date when the token is valid
*/
ConsumerToken findTopByTokenAndExpiresAfter(String token, Date validDate);
ConsumerToken findByConsumerId(Long consumerId);
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ReleaseHistoryController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.ReleaseHistoryService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@RestController
public class ReleaseHistoryController {
private final ReleaseHistoryService releaseHistoryService;
private final PermissionValidator permissionValidator;
public ReleaseHistoryController(final ReleaseHistoryService releaseHistoryService, final PermissionValidator permissionValidator) {
this.releaseHistoryService = releaseHistoryService;
this.permissionValidator = permissionValidator;
}
@GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories")
public List<ReleaseHistoryBO> findReleaseHistoriesByNamespace(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "size", defaultValue = "10") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return releaseHistoryService.findNamespaceReleaseHistory(appId, Env.valueOf(env), clusterName ,namespaceName, page, size);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.component.PermissionValidator;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.service.ReleaseHistoryService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Collections;
import java.util.List;
@RestController
public class ReleaseHistoryController {
private final ReleaseHistoryService releaseHistoryService;
private final PermissionValidator permissionValidator;
public ReleaseHistoryController(final ReleaseHistoryService releaseHistoryService, final PermissionValidator permissionValidator) {
this.releaseHistoryService = releaseHistoryService;
this.permissionValidator = permissionValidator;
}
@GetMapping("/apps/{appId}/envs/{env}/clusters/{clusterName}/namespaces/{namespaceName}/releases/histories")
public List<ReleaseHistoryBO> findReleaseHistoriesByNamespace(@PathVariable String appId,
@PathVariable String env,
@PathVariable String clusterName,
@PathVariable String namespaceName,
@RequestParam(value = "page", defaultValue = "0") int page,
@RequestParam(value = "size", defaultValue = "10") int size) {
if (permissionValidator.shouldHideConfigToCurrentUser(appId, env, namespaceName)) {
return Collections.emptyList();
}
return releaseHistoryService.findNamespaceReleaseHistory(appId, Env.valueOf(env), clusterName ,namespaceName, page, size);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/ExceptionUtils.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.google.common.base.MoreObjects;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.web.client.HttpStatusCodeException;
import java.lang.reflect.Type;
import java.util.Map;
public final class ExceptionUtils {
private static Gson gson = new Gson();
private static Type mapType = new TypeToken<Map<String, Object>>() {}.getType();
public static String toString(HttpStatusCodeException e) {
Map<String, Object> errorAttributes = gson.fromJson(e.getResponseBodyAsString(), mapType);
if (errorAttributes != null) {
return MoreObjects.toStringHelper(HttpStatusCodeException.class).omitNullValues()
.add("status", errorAttributes.get("status"))
.add("message", errorAttributes.get("message"))
.add("timestamp", errorAttributes.get("timestamp"))
.add("exception", errorAttributes.get("exception"))
.add("errorCode", errorAttributes.get("errorCode"))
.add("stackTrace", errorAttributes.get("stackTrace")).toString();
}
return "";
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.google.common.base.MoreObjects;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.springframework.web.client.HttpStatusCodeException;
import java.lang.reflect.Type;
import java.util.Map;
public final class ExceptionUtils {
private static Gson gson = new Gson();
private static Type mapType = new TypeToken<Map<String, Object>>() {}.getType();
public static String toString(HttpStatusCodeException e) {
Map<String, Object> errorAttributes = gson.fromJson(e.getResponseBodyAsString(), mapType);
if (errorAttributes != null) {
return MoreObjects.toStringHelper(HttpStatusCodeException.class).omitNullValues()
.add("status", errorAttributes.get("status"))
.add("message", errorAttributes.get("message"))
.add("timestamp", errorAttributes.get("timestamp"))
.add("exception", errorAttributes.get("exception"))
.add("errorCode", errorAttributes.get("errorCode"))
.add("stackTrace", errorAttributes.get("stackTrace")).toString();
}
return "";
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/oidc/OidcLocalUserServiceImpl.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.oidc;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.UserPO;
import com.ctrip.framework.apollo.portal.repository.UserRepository;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.JdbcUserDetailsManager;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class OidcLocalUserServiceImpl implements OidcLocalUserService {
private final Collection<? extends GrantedAuthority> authorities = Collections
.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
private final PasswordEncoder placeholderDelegatingPasswordEncoder = new DelegatingPasswordEncoder(
PlaceholderPasswordEncoder.ENCODING_ID, Collections
.singletonMap(PlaceholderPasswordEncoder.ENCODING_ID, new PlaceholderPasswordEncoder()));
private final JdbcUserDetailsManager userDetailsManager;
private final UserRepository userRepository;
public OidcLocalUserServiceImpl(
JdbcUserDetailsManager userDetailsManager,
UserRepository userRepository) {
this.userDetailsManager = userDetailsManager;
this.userRepository = userRepository;
}
@Transactional(rollbackFor = Exception.class)
@Override
public void createLocalUser(UserInfo newUserInfo) {
UserDetails user = new User(newUserInfo.getUserId(),
this.placeholderDelegatingPasswordEncoder.encode(""), authorities);
userDetailsManager.createUser(user);
this.updateUserInfoInternal(newUserInfo);
}
private void updateUserInfoInternal(UserInfo newUserInfo) {
UserPO managedUser = userRepository.findByUsername(newUserInfo.getUserId());
if (!StringUtils.isBlank(newUserInfo.getEmail())) {
managedUser.setEmail(newUserInfo.getEmail());
}
if (!StringUtils.isBlank(newUserInfo.getName())) {
managedUser.setUserDisplayName(newUserInfo.getName());
}
userRepository.save(managedUser);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void updateUserInfo(UserInfo newUserInfo) {
this.updateUserInfoInternal(newUserInfo);
}
@Override
public List<UserInfo> searchUsers(String keyword, int offset, int limit) {
List<UserPO> users = this.findUsers(keyword);
if (CollectionUtils.isEmpty(users)) {
return Collections.emptyList();
}
return users.stream().map(UserPO::toUserInfo)
.collect(Collectors.toList());
}
private List<UserPO> findUsers(String keyword) {
if (StringUtils.isEmpty(keyword)) {
return userRepository.findFirst20ByEnabled(1);
}
List<UserPO> users = new ArrayList<>();
List<UserPO> byUsername = userRepository
.findByUsernameLikeAndEnabled("%" + keyword + "%", 1);
List<UserPO> byUserDisplayName = userRepository
.findByUserDisplayNameLikeAndEnabled("%" + keyword + "%", 1);
if (!CollectionUtils.isEmpty(byUsername)) {
users.addAll(byUsername);
}
if (!CollectionUtils.isEmpty(byUserDisplayName)) {
users.addAll(byUserDisplayName);
}
return users;
}
@Override
public UserInfo findByUserId(String userId) {
UserPO userPO = userRepository.findByUsername(userId);
return userPO == null ? null : userPO.toUserInfo();
}
@Override
public List<UserInfo> findByUserIds(List<String> userIds) {
List<UserPO> users = userRepository.findByUsernameIn(userIds);
if (CollectionUtils.isEmpty(users)) {
return Collections.emptyList();
}
return users.stream().map(UserPO::toUserInfo)
.collect(Collectors.toList());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.oidc;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.ctrip.framework.apollo.portal.entity.bo.UserInfo;
import com.ctrip.framework.apollo.portal.entity.po.UserPO;
import com.ctrip.framework.apollo.portal.repository.UserRepository;
import java.util.ArrayList;
import java.util.Base64;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.provisioning.JdbcUserDetailsManager;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class OidcLocalUserServiceImpl implements OidcLocalUserService {
private final Collection<? extends GrantedAuthority> authorities = Collections
.singletonList(new SimpleGrantedAuthority("ROLE_USER"));
private final PasswordEncoder placeholderDelegatingPasswordEncoder = new DelegatingPasswordEncoder(
PlaceholderPasswordEncoder.ENCODING_ID, Collections
.singletonMap(PlaceholderPasswordEncoder.ENCODING_ID, new PlaceholderPasswordEncoder()));
private final JdbcUserDetailsManager userDetailsManager;
private final UserRepository userRepository;
public OidcLocalUserServiceImpl(
JdbcUserDetailsManager userDetailsManager,
UserRepository userRepository) {
this.userDetailsManager = userDetailsManager;
this.userRepository = userRepository;
}
@Transactional(rollbackFor = Exception.class)
@Override
public void createLocalUser(UserInfo newUserInfo) {
UserDetails user = new User(newUserInfo.getUserId(),
this.placeholderDelegatingPasswordEncoder.encode(""), authorities);
userDetailsManager.createUser(user);
this.updateUserInfoInternal(newUserInfo);
}
private void updateUserInfoInternal(UserInfo newUserInfo) {
UserPO managedUser = userRepository.findByUsername(newUserInfo.getUserId());
if (!StringUtils.isBlank(newUserInfo.getEmail())) {
managedUser.setEmail(newUserInfo.getEmail());
}
if (!StringUtils.isBlank(newUserInfo.getName())) {
managedUser.setUserDisplayName(newUserInfo.getName());
}
userRepository.save(managedUser);
}
@Transactional(rollbackFor = Exception.class)
@Override
public void updateUserInfo(UserInfo newUserInfo) {
this.updateUserInfoInternal(newUserInfo);
}
@Override
public List<UserInfo> searchUsers(String keyword, int offset, int limit) {
List<UserPO> users = this.findUsers(keyword);
if (CollectionUtils.isEmpty(users)) {
return Collections.emptyList();
}
return users.stream().map(UserPO::toUserInfo)
.collect(Collectors.toList());
}
private List<UserPO> findUsers(String keyword) {
if (StringUtils.isEmpty(keyword)) {
return userRepository.findFirst20ByEnabled(1);
}
List<UserPO> users = new ArrayList<>();
List<UserPO> byUsername = userRepository
.findByUsernameLikeAndEnabled("%" + keyword + "%", 1);
List<UserPO> byUserDisplayName = userRepository
.findByUserDisplayNameLikeAndEnabled("%" + keyword + "%", 1);
if (!CollectionUtils.isEmpty(byUsername)) {
users.addAll(byUsername);
}
if (!CollectionUtils.isEmpty(byUserDisplayName)) {
users.addAll(byUserDisplayName);
}
return users;
}
@Override
public UserInfo findByUserId(String userId) {
UserPO userPO = userRepository.findByUsername(userId);
return userPO == null ? null : userPO.toUserInfo();
}
@Override
public List<UserInfo> findByUserIds(List<String> userIds) {
List<UserPO> users = userRepository.findByUsernameIn(userIds);
if (CollectionUtils.isEmpty(users)) {
return Collections.emptyList();
}
return users.stream().map(UserPO::toUserInfo)
.collect(Collectors.toList());
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/spi/DefaultApolloConfigRegistrarHelper.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.config.PropertySourcesProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import com.google.common.collect.Lists;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
public class DefaultApolloConfigRegistrarHelper implements ApolloConfigRegistrarHelper {
private Environment environment;
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
AnnotationAttributes attributes = AnnotationAttributes
.fromMap(importingClassMetadata.getAnnotationAttributes(EnableApolloConfig.class.getName()));
final String[] namespaces = attributes.getStringArray("value");
final int order = attributes.getNumber("order");
final String[] resolvedNamespaces = this.resolveNamespaces(namespaces);
PropertySourcesProcessor.addNamespaces(Lists.newArrayList(resolvedNamespaces), order);
Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
// to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
propertySourcesPlaceholderPropertyValues.put("order", 0);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesProcessor.class.getName(),
PropertySourcesProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueDefinitionProcessor.class.getName(),
SpringValueDefinitionProcessor.class);
}
private String[] resolveNamespaces(String[] namespaces) {
String[] resolvedNamespaces = new String[namespaces.length];
for (int i = 0; i < namespaces.length; i++) {
// throw IllegalArgumentException if given text is null or if any placeholders are unresolvable
resolvedNamespaces[i] = this.environment.resolveRequiredPlaceholders(namespaces[i]);
}
return resolvedNamespaces;
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
@Override
public void setEnvironment(Environment environment) {
this.environment = environment;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import com.ctrip.framework.apollo.core.spi.Ordered;
import com.ctrip.framework.apollo.spring.annotation.ApolloAnnotationProcessor;
import com.ctrip.framework.apollo.spring.annotation.EnableApolloConfig;
import com.ctrip.framework.apollo.spring.annotation.SpringValueProcessor;
import com.ctrip.framework.apollo.spring.config.PropertySourcesProcessor;
import com.ctrip.framework.apollo.spring.property.SpringValueDefinitionProcessor;
import com.ctrip.framework.apollo.spring.util.BeanRegistrationUtil;
import com.google.common.collect.Lists;
import java.util.HashMap;
import java.util.Map;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
public class DefaultApolloConfigRegistrarHelper implements ApolloConfigRegistrarHelper {
private Environment environment;
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
AnnotationAttributes attributes = AnnotationAttributes
.fromMap(importingClassMetadata.getAnnotationAttributes(EnableApolloConfig.class.getName()));
final String[] namespaces = attributes.getStringArray("value");
final int order = attributes.getNumber("order");
final String[] resolvedNamespaces = this.resolveNamespaces(namespaces);
PropertySourcesProcessor.addNamespaces(Lists.newArrayList(resolvedNamespaces), order);
Map<String, Object> propertySourcesPlaceholderPropertyValues = new HashMap<>();
// to make sure the default PropertySourcesPlaceholderConfigurer's priority is higher than PropertyPlaceholderConfigurer
propertySourcesPlaceholderPropertyValues.put("order", 0);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesPlaceholderConfigurer.class.getName(),
PropertySourcesPlaceholderConfigurer.class, propertySourcesPlaceholderPropertyValues);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, PropertySourcesProcessor.class.getName(),
PropertySourcesProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, ApolloAnnotationProcessor.class.getName(),
ApolloAnnotationProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueProcessor.class.getName(),
SpringValueProcessor.class);
BeanRegistrationUtil.registerBeanDefinitionIfNotExists(registry, SpringValueDefinitionProcessor.class.getName(),
SpringValueDefinitionProcessor.class);
}
private String[] resolveNamespaces(String[] namespaces) {
String[] resolvedNamespaces = new String[namespaces.length];
for (int i = 0; i < namespaces.length; i++) {
// throw IllegalArgumentException if given text is null or if any placeholders are unresolvable
resolvedNamespaces[i] = this.environment.resolveRequiredPlaceholders(namespaces[i]);
}
return resolvedNamespaces;
}
@Override
public int getOrder() {
return Ordered.LOWEST_PRECEDENCE;
}
@Override
public void setEnvironment(Environment environment) {
this.environment = environment;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/zh/faq/faq.md | ## 1. Apollo是什么？
Apollo（阿波罗）是携程框架部门研发的配置管理平台，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性。
更多介绍，可以参考[Apollo配置中心介绍](zh/design/apollo-introduction)
## 2. Cluster是什么？
一个应用下不同实例的分组，比如典型的可以按照数据中心分，把A机房的应用实例分为一个集群，把B机房的应用实例分为另一个集群。
## 3. Namespace是什么？
一个应用下不同配置的分组。
请参考[Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace)
## 4. 我想要接入Apollo，该如何操作？
请参考[Apollo使用指南](zh/usage/apollo-user-guide)
## 5. 我的应用需要不同机房的配置不一样，Apollo是否能支持？
Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`三、集群独立配置说明`
## 6. 我有多个应用需要使用同一份配置，Apollo是否能支持？
Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`四、多个AppId使用同一份配置`
## 7. Apollo是否支持查看权限控制或者配置加密？
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
配置加密可以参考[spring-boot-encrypt demo项目](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-encrypt)
## 8. 如果有多个config server，打包时如何配置meta server地址？
有多台meta server可以通过nginx反向代理，通过一个域名代理多个meta server实现ha。
## 9. Apollo相比于Spring Cloud Config有什么优势？
Spring Cloud Config的精妙之处在于它的配置存储于Git，这就天然的把配置的修改、权限、版本等问题隔离在外。通过这个设计使得Spring Cloud Config整体很简单，不过也带来了一些不便之处。
下面尝试做一个简单的小结：
| 功能点 | Apollo | Spring Cloud Config | 备注 |
|------------------|--------------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------|
| 配置界面 | 一个界面管理不同环境、不同集群配置 | 无，需要通过git操作 | |
| 配置生效时间 | 实时 | 重启生效，或手动refresh生效 | Spring Cloud Config需要通过Git webhook，加上额外的消息队列才能支持实时生效 |
| 版本管理 | 界面上直接提供发布历史和回滚按钮 | 无，需要通过git操作 | |
| 灰度发布 | 支持 | 不支持 | |
| 授权、审核、审计 | 界面上直接支持，而且支持修改、发布权限分离 | 需要通过git仓库设置，且不支持修改、发布权限分离 | |
| 实例配置监控 | 可以方便的看到当前哪些客户端在使用哪些配置 | 不支持 | |
| 配置获取性能 | 快，通过数据库访问，还有缓存支持 | 较慢，需要从git clone repository，然后从文件系统读取 | |
| 客户端支持 | 原生支持所有Java和.Net应用，提供API支持其它语言应用，同时也支持Spring annotation获取配置 | 支持Spring应用，提供annotation获取配置 | Apollo的适用范围更广一些 |
## 10. Apollo和Disconf相比有什么优点？
由于我们自己并非Disconf的资深用户，所以无法主观地给出评价。
不过之前Apollo技术支持群中的热心网友[@Krast](https://github.com/krast)做了一个[开源配置中心对比矩阵](https://github.com/ctripcorp/apollo/files/983064/default.pdf)，可以参考一下。 | ## 1. Apollo是什么？
Apollo（阿波罗）是携程框架部门研发的配置管理平台，能够集中化管理应用不同环境、不同集群的配置，配置修改后能够实时推送到应用端，并且具备规范的权限、流程治理等特性。
更多介绍，可以参考[Apollo配置中心介绍](zh/design/apollo-introduction)
## 2. Cluster是什么？
一个应用下不同实例的分组，比如典型的可以按照数据中心分，把A机房的应用实例分为一个集群，把B机房的应用实例分为另一个集群。
## 3. Namespace是什么？
一个应用下不同配置的分组。
请参考[Apollo核心概念之“Namespace”](zh/design/apollo-core-concept-namespace)
## 4. 我想要接入Apollo，该如何操作？
请参考[Apollo使用指南](zh/usage/apollo-user-guide)
## 5. 我的应用需要不同机房的配置不一样，Apollo是否能支持？
Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`三、集群独立配置说明`
## 6. 我有多个应用需要使用同一份配置，Apollo是否能支持？
Apollo是支持的。请参考[Apollo使用指南](zh/usage/apollo-user-guide)中的`四、多个AppId使用同一份配置`
## 7. Apollo是否支持查看权限控制或者配置加密？
从1.1.0版本开始，apollo-portal增加了查看权限的支持，可以支持配置某个环境只允许项目成员查看私有Namespace的配置。
这里的项目成员是指：
1. 项目的管理员
2. 具备该私有Namespace在该环境下的修改或发布权限
配置方式很简单，用超级管理员账号登录后，进入`管理员工具 - 系统参数`页面新增或修改`configView.memberOnly.envs`配置项即可。
配置加密可以参考[spring-boot-encrypt demo项目](https://github.com/ctripcorp/apollo-use-cases/tree/master/spring-boot-encrypt)
## 8. 如果有多个config server，打包时如何配置meta server地址？
有多台meta server可以通过nginx反向代理，通过一个域名代理多个meta server实现ha。
## 9. Apollo相比于Spring Cloud Config有什么优势？
Spring Cloud Config的精妙之处在于它的配置存储于Git，这就天然的把配置的修改、权限、版本等问题隔离在外。通过这个设计使得Spring Cloud Config整体很简单，不过也带来了一些不便之处。
下面尝试做一个简单的小结：
| 功能点 | Apollo | Spring Cloud Config | 备注 |
|------------------|--------------------------------------------|-------------------------------------------------|----------------------------------------------------------------------------|
| 配置界面 | 一个界面管理不同环境、不同集群配置 | 无，需要通过git操作 | |
| 配置生效时间 | 实时 | 重启生效，或手动refresh生效 | Spring Cloud Config需要通过Git webhook，加上额外的消息队列才能支持实时生效 |
| 版本管理 | 界面上直接提供发布历史和回滚按钮 | 无，需要通过git操作 | |
| 灰度发布 | 支持 | 不支持 | |
| 授权、审核、审计 | 界面上直接支持，而且支持修改、发布权限分离 | 需要通过git仓库设置，且不支持修改、发布权限分离 | |
| 实例配置监控 | 可以方便的看到当前哪些客户端在使用哪些配置 | 不支持 | |
| 配置获取性能 | 快，通过数据库访问，还有缓存支持 | 较慢，需要从git clone repository，然后从文件系统读取 | |
| 客户端支持 | 原生支持所有Java和.Net应用，提供API支持其它语言应用，同时也支持Spring annotation获取配置 | 支持Spring应用，提供annotation获取配置 | Apollo的适用范围更广一些 |
## 10. Apollo和Disconf相比有什么优点？
由于我们自己并非Disconf的资深用户，所以无法主观地给出评价。
不过之前Apollo技术支持群中的热心网友[@Krast](https://github.com/krast)做了一个[开源配置中心对比矩阵](https://github.com/ctripcorp/apollo/files/983064/default.pdf)，可以参考一下。 | -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/main/java/com/ctrip/framework/apollo/adminservice/AdminServiceAutoConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice;
import com.ctrip.framework.apollo.adminservice.filter.AdminServiceAuthenticationFilter;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AdminServiceAutoConfiguration {
private final BizConfig bizConfig;
public AdminServiceAutoConfiguration(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Bean
public FilterRegistrationBean<AdminServiceAuthenticationFilter> adminServiceAuthenticationFilter() {
FilterRegistrationBean<AdminServiceAuthenticationFilter> filterRegistrationBean = new FilterRegistrationBean<>();
filterRegistrationBean.setFilter(new AdminServiceAuthenticationFilter(bizConfig));
filterRegistrationBean.addUrlPatterns("/apps/*");
filterRegistrationBean.addUrlPatterns("/appnamespaces/*");
filterRegistrationBean.addUrlPatterns("/instances/*");
filterRegistrationBean.addUrlPatterns("/items/*");
filterRegistrationBean.addUrlPatterns("/namespaces/*");
filterRegistrationBean.addUrlPatterns("/releases/*");
return filterRegistrationBean;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice;
import com.ctrip.framework.apollo.adminservice.filter.AdminServiceAuthenticationFilter;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@Configuration
public class AdminServiceAutoConfiguration {
private final BizConfig bizConfig;
public AdminServiceAutoConfiguration(final BizConfig bizConfig) {
this.bizConfig = bizConfig;
}
@Bean
public FilterRegistrationBean<AdminServiceAuthenticationFilter> adminServiceAuthenticationFilter() {
FilterRegistrationBean<AdminServiceAuthenticationFilter> filterRegistrationBean = new FilterRegistrationBean<>();
filterRegistrationBean.setFilter(new AdminServiceAuthenticationFilter(bizConfig));
filterRegistrationBean.addUrlPatterns("/apps/*");
filterRegistrationBean.addUrlPatterns("/appnamespaces/*");
filterRegistrationBean.addUrlPatterns("/instances/*");
filterRegistrationBean.addUrlPatterns("/items/*");
filterRegistrationBean.addUrlPatterns("/namespaces/*");
filterRegistrationBean.addUrlPatterns("/releases/*");
return filterRegistrationBean;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/component/emailbuilder/NormalPublishEmailBuilder.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import org.springframework.stereotype.Component;
@Component
public class NormalPublishEmailBuilder extends ConfigPublishEmailBuilder {
private static final String EMAIL_SUBJECT = "[Apollo] 配置发布";
@Override
protected String subject() {
return EMAIL_SUBJECT;
}
@Override
protected String emailContent(Env env, ReleaseHistoryBO releaseHistory) {
return renderEmailCommonContent(env, releaseHistory);
}
@Override
protected String getTemplateFramework() {
return portalConfig.emailTemplateFramework();
}
@Override
protected String getDiffModuleTemplate() {
return portalConfig.emailReleaseDiffModuleTemplate();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.component.emailbuilder;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import org.springframework.stereotype.Component;
@Component
public class NormalPublishEmailBuilder extends ConfigPublishEmailBuilder {
private static final String EMAIL_SUBJECT = "[Apollo] 配置发布";
@Override
protected String subject() {
return EMAIL_SUBJECT;
}
@Override
protected String emailContent(Env env, ReleaseHistoryBO releaseHistory) {
return renderEmailCommonContent(env, releaseHistory);
}
@Override
protected String getTemplateFramework() {
return portalConfig.emailTemplateFramework();
}
@Override
protected String getDiffModuleTemplate() {
return portalConfig.emailReleaseDiffModuleTemplate();
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/condition/ConditionalOnProfile.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* {@link Conditional} that only matches when the specified profiles are active.
*
* @author Jason Song(song_s@ctrip.com)
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnProfileCondition.class)
public @interface ConditionalOnProfile {
/**
* The profiles that should be active
* @return
*/
String[] value() default {};
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.condition;
import org.springframework.context.annotation.Conditional;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
* {@link Conditional} that only matches when the specified profiles are active.
*
* @author Jason Song(song_s@ctrip.com)
*/
@Target({ ElementType.TYPE, ElementType.METHOD })
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Conditional(OnProfileCondition.class)
public @interface ConditionalOnProfile {
/**
* The profiles that should be active
* @return
*/
String[] value() default {};
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/UniqueKeyGenerator.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.google.common.base.Joiner;
import com.ctrip.framework.apollo.core.utils.ByteUtil;
import com.ctrip.framework.apollo.core.utils.MachineUtil;
import org.apache.commons.lang.time.FastDateFormat;
import java.security.SecureRandom;
import java.util.Date;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
public class UniqueKeyGenerator {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final AtomicInteger counter = new AtomicInteger(new SecureRandom().nextInt());
private static final Joiner KEY_JOINER = Joiner.on("-");
public static String generate(Object... args){
String hexIdString =
ByteUtil.toHexString(toByteArray(Objects.hash(args), MachineUtil.getMachineIdentifier(),
counter.incrementAndGet()));
return KEY_JOINER.join(TIMESTAMP_FORMAT.format(new Date()), hexIdString);
}
/**
* Concat machine id, counter and key to byte array
* Only retrieve lower 3 bytes of the id and counter and 2 bytes of the keyHashCode
*/
protected static byte[] toByteArray(int keyHashCode, int machineIdentifier, int counter) {
byte[] bytes = new byte[8];
bytes[0] = ByteUtil.int1(keyHashCode);
bytes[1] = ByteUtil.int0(keyHashCode);
bytes[2] = ByteUtil.int2(machineIdentifier);
bytes[3] = ByteUtil.int1(machineIdentifier);
bytes[4] = ByteUtil.int0(machineIdentifier);
bytes[5] = ByteUtil.int2(counter);
bytes[6] = ByteUtil.int1(counter);
bytes[7] = ByteUtil.int0(counter);
return bytes;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.google.common.base.Joiner;
import com.ctrip.framework.apollo.core.utils.ByteUtil;
import com.ctrip.framework.apollo.core.utils.MachineUtil;
import org.apache.commons.lang.time.FastDateFormat;
import java.security.SecureRandom;
import java.util.Date;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
public class UniqueKeyGenerator {
private static final FastDateFormat TIMESTAMP_FORMAT = FastDateFormat.getInstance("yyyyMMddHHmmss");
private static final AtomicInteger counter = new AtomicInteger(new SecureRandom().nextInt());
private static final Joiner KEY_JOINER = Joiner.on("-");
public static String generate(Object... args){
String hexIdString =
ByteUtil.toHexString(toByteArray(Objects.hash(args), MachineUtil.getMachineIdentifier(),
counter.incrementAndGet()));
return KEY_JOINER.join(TIMESTAMP_FORMAT.format(new Date()), hexIdString);
}
/**
* Concat machine id, counter and key to byte array
* Only retrieve lower 3 bytes of the id and counter and 2 bytes of the keyHashCode
*/
protected static byte[] toByteArray(int keyHashCode, int machineIdentifier, int counter) {
byte[] bytes = new byte[8];
bytes[0] = ByteUtil.int1(keyHashCode);
bytes[1] = ByteUtil.int0(keyHashCode);
bytes[2] = ByteUtil.int2(machineIdentifier);
bytes[3] = ByteUtil.int1(machineIdentifier);
bytes[4] = ByteUtil.int0(machineIdentifier);
bytes[5] = ByteUtil.int2(counter);
bytes[6] = ByteUtil.int1(counter);
bytes[7] = ByteUtil.int0(counter);
return bytes;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/ConfigConsts.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core;
public interface ConfigConsts {
String NAMESPACE_APPLICATION = "application";
String CLUSTER_NAME_DEFAULT = "default";
String CLUSTER_NAMESPACE_SEPARATOR = "+";
String APOLLO_CLUSTER_KEY = "apollo.cluster";
String APOLLO_META_KEY = "apollo.meta";
String CONFIG_FILE_CONTENT_KEY = "content";
String NO_APPID_PLACEHOLDER = "ApolloNoAppIdPlaceHolder";
long NOTIFICATION_ID_PLACEHOLDER = -1;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core;
public interface ConfigConsts {
String NAMESPACE_APPLICATION = "application";
String CLUSTER_NAME_DEFAULT = "default";
String CLUSTER_NAMESPACE_SEPARATOR = "+";
String APOLLO_CLUSTER_KEY = "apollo.cluster";
String APOLLO_META_KEY = "apollo.meta";
String CONFIG_FILE_CONTENT_KEY = "content";
String NO_APPID_PLACEHOLDER = "ApolloNoAppIdPlaceHolder";
long NOTIFICATION_ID_PLACEHOLDER = -1;
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/test/tools/AloneRunner.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.test.tools;
import org.junit.runner.Description;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.JUnit4;
import org.junit.runners.model.InitializationError;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/21
*/
public class AloneRunner extends Runner {
private static final String CONSTRUCTOR_ERROR_FORMAT = "Custom runner class %s should have a public constructor with signature %s(Class testClass)";
private final Runner realRunner;
private final ClassLoader testCaseClassloader;
public AloneRunner(Class<?> clazz) throws InitializationError {
AloneWith annotation = clazz.getAnnotation(
AloneWith.class);
Class<? extends Runner> realClassRunnerClass =
annotation == null ? JUnit4.class : annotation.value();
if (AloneRunner.class.isAssignableFrom(realClassRunnerClass)) {
throw new InitializationError("Dead-loop code");
}
testCaseClassloader = new AloneClassLoader();
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
try {
Class<?> newTestCaseClass = testCaseClassloader.loadClass(clazz.getName());
Class<? extends Runner> realRunnerClass = (Class<? extends Runner>) testCaseClassloader
.loadClass(realClassRunnerClass.getName());
realRunner = buildRunner(realRunnerClass, newTestCaseClass);
} catch (ReflectiveOperationException e) {
throw new InitializationError(e);
} finally {
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
}
public Description getDescription() {
return realRunner.getDescription();
}
public void run(RunNotifier runNotifier) {
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
realRunner.run(runNotifier);
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
protected Runner buildRunner(Class<? extends Runner> runnerClass,
Class<?> testClass) throws ReflectiveOperationException, InitializationError {
try {
return runnerClass.getConstructor(Class.class).newInstance(testClass);
} catch (NoSuchMethodException e) {
String simpleName = runnerClass.getSimpleName();
throw new InitializationError(String.format(
CONSTRUCTOR_ERROR_FORMAT, simpleName, simpleName));
}
}
} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.test.tools;
import org.junit.runner.Description;
import org.junit.runner.Runner;
import org.junit.runner.notification.RunNotifier;
import org.junit.runners.JUnit4;
import org.junit.runners.model.InitializationError;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/21
*/
public class AloneRunner extends Runner {
private static final String CONSTRUCTOR_ERROR_FORMAT = "Custom runner class %s should have a public constructor with signature %s(Class testClass)";
private final Runner realRunner;
private final ClassLoader testCaseClassloader;
public AloneRunner(Class<?> clazz) throws InitializationError {
AloneWith annotation = clazz.getAnnotation(
AloneWith.class);
Class<? extends Runner> realClassRunnerClass =
annotation == null ? JUnit4.class : annotation.value();
if (AloneRunner.class.isAssignableFrom(realClassRunnerClass)) {
throw new InitializationError("Dead-loop code");
}
testCaseClassloader = new AloneClassLoader();
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
try {
Class<?> newTestCaseClass = testCaseClassloader.loadClass(clazz.getName());
Class<? extends Runner> realRunnerClass = (Class<? extends Runner>) testCaseClassloader
.loadClass(realClassRunnerClass.getName());
realRunner = buildRunner(realRunnerClass, newTestCaseClass);
} catch (ReflectiveOperationException e) {
throw new InitializationError(e);
} finally {
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
}
public Description getDescription() {
return realRunner.getDescription();
}
public void run(RunNotifier runNotifier) {
ClassLoader backupClassLoader = Thread.currentThread().getContextClassLoader();
Thread.currentThread().setContextClassLoader(testCaseClassloader);
realRunner.run(runNotifier);
Thread.currentThread().setContextClassLoader(backupClassLoader);
}
protected Runner buildRunner(Class<? extends Runner> runnerClass,
Class<?> testClass) throws ReflectiveOperationException, InitializationError {
try {
return runnerClass.getConstructor(Class.class).newInstance(testClass);
} catch (NoSuchMethodException e) {
String simpleName = runnerClass.getSimpleName();
throw new InitializationError(String.format(
CONSTRUCTOR_ERROR_FORMAT, simpleName, simpleName));
}
}
} | -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/internals/LegacyMetaServerProvider.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.internals;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ResourceUtils;
import com.google.common.base.Strings;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
/**
* For legacy meta server configuration use, i.e. apollo-env.properties
*/
public class LegacyMetaServerProvider implements MetaServerProvider {
// make it as lowest as possible, yet not the lowest
public static final int ORDER = MetaServerProvider.LOWEST_PRECEDENCE - 1;
private static final Map<Env, String> domains = new HashMap<>();
public LegacyMetaServerProvider() {
initialize();
}
private void initialize() {
Properties prop = new Properties();
prop = ResourceUtils.readConfigFile("apollo-env.properties", prop);
domains.put(Env.LOCAL, getMetaServerAddress(prop, "local_meta", "local.meta"));
domains.put(Env.DEV, getMetaServerAddress(prop, "dev_meta", "dev.meta"));
domains.put(Env.FAT, getMetaServerAddress(prop, "fat_meta", "fat.meta"));
domains.put(Env.UAT, getMetaServerAddress(prop, "uat_meta", "uat.meta"));
domains.put(Env.LPT, getMetaServerAddress(prop, "lpt_meta", "lpt.meta"));
domains.put(Env.PRO, getMetaServerAddress(prop, "pro_meta", "pro.meta"));
}
private String getMetaServerAddress(Properties prop, String sourceName, String propName) {
// 1. Get from System Property.
String metaAddress = System.getProperty(sourceName);
if (Strings.isNullOrEmpty(metaAddress)) {
// 2. Get from OS environment variable, which could not contain dot and is normally in UPPER case,like DEV_META.
metaAddress = System.getenv(sourceName.toUpperCase());
}
if (Strings.isNullOrEmpty(metaAddress)) {
// 3. Get from properties file.
metaAddress = prop.getProperty(propName);
}
return metaAddress;
}
@Override
public String getMetaServerAddress(Env targetEnv) {
String metaServerAddress = domains.get(targetEnv);
return metaServerAddress == null ? null : metaServerAddress.trim();
}
@Override
public int getOrder() {
return ORDER;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.internals;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.ResourceUtils;
import com.google.common.base.Strings;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
/**
* For legacy meta server configuration use, i.e. apollo-env.properties
*/
public class LegacyMetaServerProvider implements MetaServerProvider {
// make it as lowest as possible, yet not the lowest
public static final int ORDER = MetaServerProvider.LOWEST_PRECEDENCE - 1;
private static final Map<Env, String> domains = new HashMap<>();
public LegacyMetaServerProvider() {
initialize();
}
private void initialize() {
Properties prop = new Properties();
prop = ResourceUtils.readConfigFile("apollo-env.properties", prop);
domains.put(Env.LOCAL, getMetaServerAddress(prop, "local_meta", "local.meta"));
domains.put(Env.DEV, getMetaServerAddress(prop, "dev_meta", "dev.meta"));
domains.put(Env.FAT, getMetaServerAddress(prop, "fat_meta", "fat.meta"));
domains.put(Env.UAT, getMetaServerAddress(prop, "uat_meta", "uat.meta"));
domains.put(Env.LPT, getMetaServerAddress(prop, "lpt_meta", "lpt.meta"));
domains.put(Env.PRO, getMetaServerAddress(prop, "pro_meta", "pro.meta"));
}
private String getMetaServerAddress(Properties prop, String sourceName, String propName) {
// 1. Get from System Property.
String metaAddress = System.getProperty(sourceName);
if (Strings.isNullOrEmpty(metaAddress)) {
// 2. Get from OS environment variable, which could not contain dot and is normally in UPPER case,like DEV_META.
metaAddress = System.getenv(sourceName.toUpperCase());
}
if (Strings.isNullOrEmpty(metaAddress)) {
// 3. Get from properties file.
metaAddress = prop.getProperty(propName);
}
return metaAddress;
}
@Override
public String getMetaServerAddress(Env targetEnv) {
String metaServerAddress = domains.get(targetEnv);
return metaServerAddress == null ? null : metaServerAddress.trim();
}
@Override
public int getOrder() {
return ORDER;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/service/AdminServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.exception.ServiceException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import java.util.Date;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class AdminServiceTest extends AbstractIntegrationTest {
@Autowired
private AdminService adminService;
@Autowired
private AuditService auditService;
@Autowired
private AppRepository appRepository;
@Autowired
private ClusterService clusterService;
@Autowired
private NamespaceService namespaceService;
@Autowired
private AppNamespaceService appNamespaceService;
@Test
public void testCreateNewApp() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
app = adminService.createNewApp(app);
Assert.assertEquals(appId, app.getAppId());
List<Cluster> clusters = clusterService.findParentClusters(app.getAppId());
Assert.assertEquals(1, clusters.size());
Assert.assertEquals(ConfigConsts.CLUSTER_NAME_DEFAULT, clusters.get(0).getName());
List<Namespace> namespaces = namespaceService.findNamespaces(appId, clusters.get(0).getName());
Assert.assertEquals(1, namespaces.size());
Assert.assertEquals(ConfigConsts.NAMESPACE_APPLICATION, namespaces.get(0).getNamespaceName());
List<Audit> audits = auditService.findByOwner(owner);
Assert.assertEquals(4, audits.size());
}
@Test(expected = ServiceException.class)
public void testCreateDuplicateApp() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
appRepository.save(app);
adminService.createNewApp(app);
}
@Test
public void testDeleteApp() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
app = adminService.createNewApp(app);
Assert.assertEquals(appId, app.getAppId());
Assert.assertEquals(1, appNamespaceService.findByAppId(appId).size());
Assert.assertEquals(1, clusterService.findClusters(appId).size());
Assert.assertEquals(1, namespaceService.findNamespaces(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size());
adminService.deleteApp(app, owner);
Assert.assertEquals(0, appNamespaceService.findByAppId(appId).size());
Assert.assertEquals(0, clusterService.findClusters(appId).size());
Assert
.assertEquals(0, namespaceService.findByAppIdAndNamespaceName(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.AbstractIntegrationTest;
import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.framework.apollo.biz.entity.Cluster;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.repository.AppRepository;
import com.ctrip.framework.apollo.common.entity.App;
import com.ctrip.framework.apollo.common.exception.ServiceException;
import com.ctrip.framework.apollo.core.ConfigConsts;
import java.util.Date;
import java.util.List;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
public class AdminServiceTest extends AbstractIntegrationTest {
@Autowired
private AdminService adminService;
@Autowired
private AuditService auditService;
@Autowired
private AppRepository appRepository;
@Autowired
private ClusterService clusterService;
@Autowired
private NamespaceService namespaceService;
@Autowired
private AppNamespaceService appNamespaceService;
@Test
public void testCreateNewApp() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
app = adminService.createNewApp(app);
Assert.assertEquals(appId, app.getAppId());
List<Cluster> clusters = clusterService.findParentClusters(app.getAppId());
Assert.assertEquals(1, clusters.size());
Assert.assertEquals(ConfigConsts.CLUSTER_NAME_DEFAULT, clusters.get(0).getName());
List<Namespace> namespaces = namespaceService.findNamespaces(appId, clusters.get(0).getName());
Assert.assertEquals(1, namespaces.size());
Assert.assertEquals(ConfigConsts.NAMESPACE_APPLICATION, namespaces.get(0).getNamespaceName());
List<Audit> audits = auditService.findByOwner(owner);
Assert.assertEquals(4, audits.size());
}
@Test(expected = ServiceException.class)
public void testCreateDuplicateApp() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
appRepository.save(app);
adminService.createNewApp(app);
}
@Test
public void testDeleteApp() {
String appId = "someAppId";
App app = new App();
app.setAppId(appId);
app.setName("someAppName");
String owner = "someOwnerName";
app.setOwnerName(owner);
app.setOwnerEmail("someOwnerName@ctrip.com");
app.setDataChangeCreatedBy(owner);
app.setDataChangeLastModifiedBy(owner);
app.setDataChangeCreatedTime(new Date());
app = adminService.createNewApp(app);
Assert.assertEquals(appId, app.getAppId());
Assert.assertEquals(1, appNamespaceService.findByAppId(appId).size());
Assert.assertEquals(1, clusterService.findClusters(appId).size());
Assert.assertEquals(1, namespaceService.findNamespaces(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size());
adminService.deleteApp(app, owner);
Assert.assertEquals(0, appNamespaceService.findByAppId(appId).size());
Assert.assertEquals(0, clusterService.findClusters(appId).size());
Assert
.assertEquals(0, namespaceService.findByAppIdAndNamespaceName(appId, ConfigConsts.CLUSTER_NAME_DEFAULT).size());
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/util/Slf4jLogMessageFormatter.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.util;
import org.slf4j.helpers.MessageFormatter;
import org.springframework.core.log.LogMessage;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class Slf4jLogMessageFormatter {
/**
* format log message
*
* @param pattern slf4j log message patten
* @param args log message args
* @return string
*/
public static LogMessage format(String pattern, Object... args) {
return LogMessage.of(() -> MessageFormatter.arrayFormat(pattern, args, null).getMessage());
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.util;
import org.slf4j.helpers.MessageFormatter;
import org.springframework.core.log.LogMessage;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class Slf4jLogMessageFormatter {
/**
* format log message
*
* @param pattern slf4j log message patten
* @param args log message args
* @return string
*/
public static LogMessage format(String pattern, Object... args) {
return LogMessage.of(() -> MessageFormatter.arrayFormat(pattern, args, null).getMessage());
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/repository/ServerConfigRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.portal.entity.po.ServerConfig;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ServerConfigRepository extends PagingAndSortingRepository<ServerConfig, Long> {
ServerConfig findByKey(String key);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.repository;
import com.ctrip.framework.apollo.portal.entity.po.ServerConfig;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface ServerConfigRepository extends PagingAndSortingRepository<ServerConfig, Long> {
ServerConfig findByKey(String key);
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/tracer/spi/MessageProducer.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer.spi;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageProducer {
/**
* Log an error.
*
* @param cause root cause exception
*/
void logError(Throwable cause);
/**
* Log an error.
*
* @param cause root cause exception
*/
void logError(String message, Throwable cause);
/**
* Log an event in one shot with SUCCESS status.
*
* @param type event type
* @param name event name
*/
void logEvent(String type, String name);
/**
* Log an event in one shot.
*
* @param type event type
* @param name event name
* @param status "0" means success, otherwise means error code
* @param nameValuePairs name value pairs in the format of "a=1&b=2&..."
*/
void logEvent(String type, String name, String status, String nameValuePairs);
/**
* Create a new transaction with given type and name.
*
* @param type transaction type
* @param name transaction name
*/
Transaction newTransaction(String type, String name);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer.spi;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageProducer {
/**
* Log an error.
*
* @param cause root cause exception
*/
void logError(Throwable cause);
/**
* Log an error.
*
* @param cause root cause exception
*/
void logError(String message, Throwable cause);
/**
* Log an event in one shot with SUCCESS status.
*
* @param type event type
* @param name event name
*/
void logEvent(String type, String name);
/**
* Log an event in one shot.
*
* @param type event type
* @param name event name
* @param status "0" means success, otherwise means error code
* @param nameValuePairs name value pairs in the format of "a=1&b=2&..."
*/
void logEvent(String type, String name, String status, String nameValuePairs);
/**
* Create a new transaction with given type and name.
*
* @param type transaction type
* @param name transaction name
*/
Transaction newTransaction(String type, String name);
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/springsecurity/ApolloPasswordEncoderFactory.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.spi.oidc.PlaceholderPasswordEncoder;
import java.util.HashMap;
import java.util.Map;
import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public final class ApolloPasswordEncoderFactory {
private ApolloPasswordEncoderFactory() {
}
/**
* Creates a {@link DelegatingPasswordEncoder} with default mappings {@link
* PasswordEncoderFactories#createDelegatingPasswordEncoder()}, and add a placeholder encoder for
* oidc {@link PlaceholderPasswordEncoder}
*
* @return the {@link PasswordEncoder} to use
*/
@SuppressWarnings("deprecation")
public static PasswordEncoder createDelegatingPasswordEncoder() {
// copy from PasswordEncoderFactories, and it's should follow the upgrade of the PasswordEncoderFactories
String encodingId = "bcrypt";
Map<String, PasswordEncoder> encoders = new HashMap<>();
encoders.put(encodingId, new BCryptPasswordEncoder());
encoders.put("ldap", new org.springframework.security.crypto.password.LdapShaPasswordEncoder());
encoders.put("MD4", new org.springframework.security.crypto.password.Md4PasswordEncoder());
encoders.put("MD5",
new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("MD5"));
encoders.put("noop",
org.springframework.security.crypto.password.NoOpPasswordEncoder.getInstance());
encoders.put("pbkdf2", new Pbkdf2PasswordEncoder());
encoders.put("scrypt", new SCryptPasswordEncoder());
encoders.put("SHA-1",
new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-1"));
encoders.put("SHA-256",
new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-256"));
encoders
.put("sha256", new org.springframework.security.crypto.password.StandardPasswordEncoder());
encoders.put("argon2", new Argon2PasswordEncoder());
// placeholder encoder for oidc
encoders.put(PlaceholderPasswordEncoder.ENCODING_ID, new PlaceholderPasswordEncoder());
DelegatingPasswordEncoder delegatingPasswordEncoder = new DelegatingPasswordEncoder(encodingId,
encoders);
// todo: adapt the old password, and it should be removed in the next feature version of the 1.9.x
delegatingPasswordEncoder.setDefaultPasswordEncoderForMatches(new PasswordEncoderAdapter(encoders.get(encodingId)));
return delegatingPasswordEncoder;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.springsecurity;
import com.ctrip.framework.apollo.portal.spi.oidc.PlaceholderPasswordEncoder;
import java.util.HashMap;
import java.util.Map;
import org.springframework.security.crypto.argon2.Argon2PasswordEncoder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.crypto.password.DelegatingPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public final class ApolloPasswordEncoderFactory {
private ApolloPasswordEncoderFactory() {
}
/**
* Creates a {@link DelegatingPasswordEncoder} with default mappings {@link
* PasswordEncoderFactories#createDelegatingPasswordEncoder()}, and add a placeholder encoder for
* oidc {@link PlaceholderPasswordEncoder}
*
* @return the {@link PasswordEncoder} to use
*/
@SuppressWarnings("deprecation")
public static PasswordEncoder createDelegatingPasswordEncoder() {
// copy from PasswordEncoderFactories, and it's should follow the upgrade of the PasswordEncoderFactories
String encodingId = "bcrypt";
Map<String, PasswordEncoder> encoders = new HashMap<>();
encoders.put(encodingId, new BCryptPasswordEncoder());
encoders.put("ldap", new org.springframework.security.crypto.password.LdapShaPasswordEncoder());
encoders.put("MD4", new org.springframework.security.crypto.password.Md4PasswordEncoder());
encoders.put("MD5",
new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("MD5"));
encoders.put("noop",
org.springframework.security.crypto.password.NoOpPasswordEncoder.getInstance());
encoders.put("pbkdf2", new Pbkdf2PasswordEncoder());
encoders.put("scrypt", new SCryptPasswordEncoder());
encoders.put("SHA-1",
new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-1"));
encoders.put("SHA-256",
new org.springframework.security.crypto.password.MessageDigestPasswordEncoder("SHA-256"));
encoders
.put("sha256", new org.springframework.security.crypto.password.StandardPasswordEncoder());
encoders.put("argon2", new Argon2PasswordEncoder());
// placeholder encoder for oidc
encoders.put(PlaceholderPasswordEncoder.ENCODING_ID, new PlaceholderPasswordEncoder());
DelegatingPasswordEncoder delegatingPasswordEncoder = new DelegatingPasswordEncoder(encodingId,
encoders);
// todo: adapt the old password, and it should be removed in the next feature version of the 1.9.x
delegatingPasswordEncoder.setDefaultPasswordEncoderForMatches(new PasswordEncoderAdapter(encoders.get(encodingId)));
return delegatingPasswordEncoder;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/EnableApolloConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
import org.springframework.core.Ordered;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to register Apollo property sources when using Java Config.
*
* <p>Configuration example with multiple namespaces:</p>
* <pre class="code">
* @Configuration
* @EnableApolloConfig({"someNamespace","anotherNamespace"})
* public class AppConfig {
*
* }
* </pre>
*
* <p>Configuration example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* // Please note that this placeholder could not be configured in Apollo as Apollo is not activated during this phase.
* @Configuration
* @EnableApolloConfig({"${redis.namespace:xxx}"})
* public class AppConfig {
*
* }
* </pre>
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Documented
@Import(ApolloConfigRegistrar.class)
public @interface EnableApolloConfig {
/**
* Apollo namespaces to inject configuration into Spring Property Sources.
*/
String[] value() default {ConfigConsts.NAMESPACE_APPLICATION};
/**
* The order of the apollo config, default is {@link Ordered#LOWEST_PRECEDENCE}, which is Integer.MAX_VALUE.
* If there are properties with the same name in different apollo configs, the apollo config with smaller order wins.
* @return
*/
int order() default Ordered.LOWEST_PRECEDENCE;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import org.springframework.context.annotation.Import;
import org.springframework.core.Ordered;
import com.ctrip.framework.apollo.core.ConfigConsts;
/**
* Use this annotation to register Apollo property sources when using Java Config.
*
* <p>Configuration example with multiple namespaces:</p>
* <pre class="code">
* @Configuration
* @EnableApolloConfig({"someNamespace","anotherNamespace"})
* public class AppConfig {
*
* }
* </pre>
*
* <p>Configuration example with placeholder:</p>
* <pre class="code">
* // The namespace could also be specified as a placeholder, e.g. ${redis.namespace:xxx},
* // which will use the value of the key "redis.namespace" or "xxx" if this key is not configured.
* // Please note that this placeholder could not be configured in Apollo as Apollo is not activated during this phase.
* @Configuration
* @EnableApolloConfig({"${redis.namespace:xxx}"})
* public class AppConfig {
*
* }
* </pre>
*
* @author Jason Song(song_s@ctrip.com)
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
@Documented
@Import(ApolloConfigRegistrar.class)
public @interface EnableApolloConfig {
/**
* Apollo namespaces to inject configuration into Spring Property Sources.
*/
String[] value() default {ConfigConsts.NAMESPACE_APPLICATION};
/**
* The order of the apollo config, default is {@link Ordered#LOWEST_PRECEDENCE}, which is Integer.MAX_VALUE.
* If there are properties with the same name in different apollo configs, the apollo config with smaller order wins.
* @return
*/
int order() default Ordered.LOWEST_PRECEDENCE;
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/OpenGrayReleaseRuleDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenGrayReleaseRuleDTO extends BaseDTO{
private String appId;
private String clusterName;
private String namespaceName;
private String branchName;
private Set<OpenGrayReleaseRuleItemDTO> ruleItems;
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
public String getBranchName() {
return branchName;
}
public void setBranchName(String branchName) {
this.branchName = branchName;
}
public Set<OpenGrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public void setRuleItems(Set<OpenGrayReleaseRuleItemDTO> ruleItems) {
this.ruleItems = ruleItems;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenGrayReleaseRuleDTO extends BaseDTO{
private String appId;
private String clusterName;
private String namespaceName;
private String branchName;
private Set<OpenGrayReleaseRuleItemDTO> ruleItems;
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public void setNamespaceName(String namespaceName) {
this.namespaceName = namespaceName;
}
public String getBranchName() {
return branchName;
}
public void setBranchName(String branchName) {
this.branchName = branchName;
}
public Set<OpenGrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public void setRuleItems(Set<OpenGrayReleaseRuleItemDTO> ruleItems) {
this.ruleItems = ruleItems;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/ClusterOpenApiServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.*;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.util.EntityUtils;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class ClusterOpenApiServiceTest extends AbstractOpenApiServiceTest {
private ClusterOpenApiService clusterOpenApiService;
private String someAppId;
private String someEnv;
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
someEnv = "someEnv";
StringEntity responseEntity = new StringEntity("{}");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
clusterOpenApiService = new ClusterOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testGetCluster() throws Exception {
String someCluster = "someCluster";
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
clusterOpenApiService.getCluster(someAppId, someEnv, someCluster);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s", someBaseUrl, someEnv, someAppId, someCluster),
get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetClusterWithError() throws Exception {
String someCluster = "someCluster";
when(statusLine.getStatusCode()).thenReturn(404);
clusterOpenApiService.getCluster(someAppId, someEnv, someCluster);
}
@Test
public void testCreateCluster() throws Exception {
String someCluster = "someCluster";
String someCreatedBy = "someCreatedBy";
OpenClusterDTO clusterDTO = new OpenClusterDTO();
clusterDTO.setAppId(someAppId);
clusterDTO.setName(someCluster);
clusterDTO.setDataChangeCreatedBy(someCreatedBy);
final ArgumentCaptor<HttpPost> request = ArgumentCaptor.forClass(HttpPost.class);
clusterOpenApiService.createCluster(someEnv, clusterDTO);
verify(httpClient, times(1)).execute(request.capture());
HttpPost post = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters", someBaseUrl, someEnv, someAppId), post.getURI().toString());
StringEntity entity = (StringEntity) post.getEntity();
assertEquals(ContentType.APPLICATION_JSON.toString(), entity.getContentType().getValue());
assertEquals(gson.toJson(clusterDTO), EntityUtils.toString(entity));
}
@Test(expected = RuntimeException.class)
public void testCreateClusterWithError() throws Exception {
String someCluster = "someCluster";
String someCreatedBy = "someCreatedBy";
OpenClusterDTO clusterDTO = new OpenClusterDTO();
clusterDTO.setAppId(someAppId);
clusterDTO.setName(someCluster);
clusterDTO.setDataChangeCreatedBy(someCreatedBy);
when(statusLine.getStatusCode()).thenReturn(400);
clusterOpenApiService.createCluster(someEnv, clusterDTO);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.junit.Assert.*;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.dto.OpenClusterDTO;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.ContentType;
import org.apache.http.entity.StringEntity;
import org.apache.http.util.EntityUtils;
import org.junit.Before;
import org.junit.Test;
import org.mockito.ArgumentCaptor;
public class ClusterOpenApiServiceTest extends AbstractOpenApiServiceTest {
private ClusterOpenApiService clusterOpenApiService;
private String someAppId;
private String someEnv;
@Before
public void setUp() throws Exception {
super.setUp();
someAppId = "someAppId";
someEnv = "someEnv";
StringEntity responseEntity = new StringEntity("{}");
when(someHttpResponse.getEntity()).thenReturn(responseEntity);
clusterOpenApiService = new ClusterOpenApiService(httpClient, someBaseUrl, gson);
}
@Test
public void testGetCluster() throws Exception {
String someCluster = "someCluster";
final ArgumentCaptor<HttpGet> request = ArgumentCaptor.forClass(HttpGet.class);
clusterOpenApiService.getCluster(someAppId, someEnv, someCluster);
verify(httpClient, times(1)).execute(request.capture());
HttpGet get = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters/%s", someBaseUrl, someEnv, someAppId, someCluster),
get.getURI().toString());
}
@Test(expected = RuntimeException.class)
public void testGetClusterWithError() throws Exception {
String someCluster = "someCluster";
when(statusLine.getStatusCode()).thenReturn(404);
clusterOpenApiService.getCluster(someAppId, someEnv, someCluster);
}
@Test
public void testCreateCluster() throws Exception {
String someCluster = "someCluster";
String someCreatedBy = "someCreatedBy";
OpenClusterDTO clusterDTO = new OpenClusterDTO();
clusterDTO.setAppId(someAppId);
clusterDTO.setName(someCluster);
clusterDTO.setDataChangeCreatedBy(someCreatedBy);
final ArgumentCaptor<HttpPost> request = ArgumentCaptor.forClass(HttpPost.class);
clusterOpenApiService.createCluster(someEnv, clusterDTO);
verify(httpClient, times(1)).execute(request.capture());
HttpPost post = request.getValue();
assertEquals(String
.format("%s/envs/%s/apps/%s/clusters", someBaseUrl, someEnv, someAppId), post.getURI().toString());
StringEntity entity = (StringEntity) post.getEntity();
assertEquals(ContentType.APPLICATION_JSON.toString(), entity.getContentType().getValue());
assertEquals(gson.toJson(clusterDTO), EntityUtils.toString(entity));
}
@Test(expected = RuntimeException.class)
public void testCreateClusterWithError() throws Exception {
String someCluster = "someCluster";
String someCreatedBy = "someCreatedBy";
OpenClusterDTO clusterDTO = new OpenClusterDTO();
clusterDTO.setAppId(someAppId);
clusterDTO.setName(someCluster);
clusterDTO.setDataChangeCreatedBy(someCreatedBy);
when(statusLine.getStatusCode()).thenReturn(400);
clusterOpenApiService.createCluster(someEnv, clusterDTO);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/AppNamespaceRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
import java.util.Set;
public interface AppNamespaceRepository extends PagingAndSortingRepository<AppNamespace, Long>{
AppNamespace findByAppIdAndName(String appId, String namespaceName);
List<AppNamespace> findByAppIdAndNameIn(String appId, Set<String> namespaceNames);
AppNamespace findByNameAndIsPublicTrue(String namespaceName);
List<AppNamespace> findByNameInAndIsPublicTrue(Set<String> namespaceNames);
List<AppNamespace> findByAppIdAndIsPublic(String appId, boolean isPublic);
List<AppNamespace> findByAppId(String appId);
List<AppNamespace> findFirst500ByIdGreaterThanOrderByIdAsc(long id);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?3 WHERE AppId=?1 and Name = ?2")
int delete(String appId, String namespaceName, String operator);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.common.entity.AppNamespace;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
import java.util.Set;
public interface AppNamespaceRepository extends PagingAndSortingRepository<AppNamespace, Long>{
AppNamespace findByAppIdAndName(String appId, String namespaceName);
List<AppNamespace> findByAppIdAndNameIn(String appId, Set<String> namespaceNames);
AppNamespace findByNameAndIsPublicTrue(String namespaceName);
List<AppNamespace> findByNameInAndIsPublicTrue(Set<String> namespaceNames);
List<AppNamespace> findByAppIdAndIsPublic(String appId, boolean isPublic);
List<AppNamespace> findByAppId(String appId);
List<AppNamespace> findFirst500ByIdGreaterThanOrderByIdAsc(long id);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?2 WHERE AppId=?1")
int batchDeleteByAppId(String appId, String operator);
@Modifying
@Query("UPDATE AppNamespace SET IsDeleted=1,DataChange_LastModifiedBy = ?3 WHERE AppId=?1 and Name = ?2")
int delete(String appId, String namespaceName, String operator);
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/InstanceDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class InstanceDTO {
private long id;
private String appId;
private String clusterName;
private String dataCenter;
private String ip;
private List<InstanceConfigDTO> configs;
private Date dataChangeCreatedTime;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getDataCenter() {
return dataCenter;
}
public void setDataCenter(String dataCenter) {
this.dataCenter = dataCenter;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
public List<InstanceConfigDTO> getConfigs() {
return configs;
}
public void setConfigs(List<InstanceConfigDTO> configs) {
this.configs = configs;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import java.util.Date;
import java.util.List;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class InstanceDTO {
private long id;
private String appId;
private String clusterName;
private String dataCenter;
private String ip;
private List<InstanceConfigDTO> configs;
private Date dataChangeCreatedTime;
public long getId() {
return id;
}
public void setId(long id) {
this.id = id;
}
public String getAppId() {
return appId;
}
public void setAppId(String appId) {
this.appId = appId;
}
public String getClusterName() {
return clusterName;
}
public void setClusterName(String clusterName) {
this.clusterName = clusterName;
}
public String getDataCenter() {
return dataCenter;
}
public void setDataCenter(String dataCenter) {
this.dataCenter = dataCenter;
}
public String getIp() {
return ip;
}
public void setIp(String ip) {
this.ip = ip;
}
public List<InstanceConfigDTO> getConfigs() {
return configs;
}
public void setConfigs(List<InstanceConfigDTO> configs) {
this.configs = configs;
}
public Date getDataChangeCreatedTime() {
return dataChangeCreatedTime;
}
public void setDataChangeCreatedTime(Date dataChangeCreatedTime) {
this.dataChangeCreatedTime = dataChangeCreatedTime;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/repository/ItemRepository.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Item;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
public interface ItemRepository extends PagingAndSortingRepository<Item, Long> {
Item findByNamespaceIdAndKey(Long namespaceId, String key);
List<Item> findByNamespaceIdOrderByLineNumAsc(Long namespaceId);
List<Item> findByNamespaceId(Long namespaceId);
List<Item> findByNamespaceIdAndDataChangeLastModifiedTimeGreaterThan(Long namespaceId, Date date);
Item findFirst1ByNamespaceIdOrderByLineNumDesc(Long namespaceId);
@Modifying
@Query("update Item set isdeleted=1,DataChange_LastModifiedBy = ?2 where namespaceId = ?1")
int deleteByNamespaceId(long namespaceId, String operator);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.repository;
import com.ctrip.framework.apollo.biz.entity.Item;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.Date;
import java.util.List;
public interface ItemRepository extends PagingAndSortingRepository<Item, Long> {
Item findByNamespaceIdAndKey(Long namespaceId, String key);
List<Item> findByNamespaceIdOrderByLineNumAsc(Long namespaceId);
List<Item> findByNamespaceId(Long namespaceId);
List<Item> findByNamespaceIdAndDataChangeLastModifiedTimeGreaterThan(Long namespaceId, Date date);
Item findFirst1ByNamespaceIdOrderByLineNumDesc(Long namespaceId);
@Modifying
@Query("update Item set isdeleted=1,DataChange_LastModifiedBy = ?2 where namespaceId = ?1")
int deleteByNamespaceId(long namespaceId, String operator);
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./docs/zh/design/apollo-core-concept-namespace.md | ### 1. 什么是Namespace?
Namespace是配置项的集合，类似于一个配置文件的概念。
### 2. 什么是“application”的Namespace？
Apollo在创建项目的时候，都会默认创建一个“application”的Namespace。顾名思义，“application”是给应用自身使用的，熟悉Spring Boot的同学都知道，Spring Boot项目都有一个默认配置文件application.yml。在这里application.yml就等同于“application”的Namespace。对于90%的应用来说，“application”的Namespace已经满足日常配置使用场景了。
#### 客户端获取“application” Namespace的代码如下：
``` java
Config config = ConfigService.getAppConfig();
```
#### 客户端获取非“application” Namespace的代码如下：
``` java
Config config = ConfigService.getConfig(namespaceName);
```
### 3. Namespace的格式有哪些？
配置文件有多种格式，例如：properties、xml、yml、yaml、json等。同样Namespace也具有这些格式。在Portal UI中可以看到“application”的Namespace上有一个“properties”标签，表明“application”是properties格式的。
>注1：非properties格式的namespace，在客户端使用时需要调用`ConfigService.getConfigFile(String namespace, ConfigFileFormat configFileFormat)`来获取，如果使用[Http接口直接调用](zh/usage/other-language-client-user-guide#_12-通过带缓存的http接口从apollo读取配置)时，对应的namespace参数需要传入namespace的名字加上后缀名，如datasources.json。
>注2：apollo-client 1.3.0版本开始对yaml/yml做了更好的支持，使用起来和properties格式一致：`Config config = ConfigService.getConfig("application.yml");`，Spring的注入方式也和properties一致。
### 4. Namespace的获取权限分类
Namespace的获取权限分为两种：
* private （私有的）
* public （公共的）
这里的获取权限是相对于Apollo客户端来说的。
#### 4.1 private权限
private权限的Namespace，只能被所属的应用获取到。一个应用尝试获取其它应用private的Namespace，Apollo会报“404”异常。
#### 4.2 public权限
public权限的Namespace，能被任何应用获取。
### 5. Namespace的类型
Namespace类型有三种：
* 私有类型
* 公共类型
* 关联类型（继承类型）
#### 5.1 私有类型
私有类型的Namespace具有private权限。例如上文提到的“application” Namespace就是私有类型。
#### 5.2 公共类型
##### 5.2.1 含义
公共类型的Namespace具有public权限。公共类型的Namespace相当于游离于应用之外的配置，且通过Namespace的名称去标识公共Namespace，所以公共的Namespace的名称必须全局唯一。
##### 5.2.2 使用场景
* 部门级别共享的配置
* 小组级别共享的配置
* 几个项目之间共享的配置
* 中间件客户端的配置
#### 5.3 关联类型
##### 5.3.1 含义
关联类型又可称为继承类型，关联类型具有private权限。关联类型的Namespace继承于公共类型的Namespace，用于覆盖公共Namespace的某些配置。例如公共的Namespace有两个配置项
```
k1 = v1
k2 = v2
```
然后应用A有一个关联类型的Namespace关联了此公共Namespace，且覆盖了配置项k1，新值为v3。那么在应用A实际运行时，获取到的公共Namespace的配置为：
```
k1 = v3
k2 = v2
```
##### 5.3.2 使用场景
举一个实际使用的场景。假设RPC框架的配置（如：timeout）有以下要求：
* 提供一份全公司默认的配置且可动态调整
* RPC客户端项目可以自定义某些配置项且可动态调整
1. 如果把以上两点要求去掉“动态调整”，那么做法很简单。在rpc-client.jar包里有一份配置文件，每次修改配置文件然后重新发一个版本的jar包即可。同理，客户端项目修改配置也是如此。
2. 如果只支持客户端项目可动态调整配置。客户端项目可以在Apollo “application” Namespace上配置一些配置项。在初始化service的时候，从Apollo上读取配置即可。这样做的坏处就是，每个项目都要自定义一些key，不统一。
3. 那么如何完美支持以上需求呢？答案就是结合使用Apollo的公共类型的Namespace和关联类型的Namespace。RPC团队在Apollo上维护一个叫“rpc-client”的公共Namespace，在“rpc-client” Namespace上配置默认的参数值。rpc-client.jar里的代码读取“rpc-client”Namespace的配置即可。如果需要调整默认的配置，只需要修改公共类型“rpc-client” Namespace的配置。如果客户端项目想要自定义或动态修改某些配置项，只需要在Apollo 自己项目下关联“rpc-client”，就能创建关联类型“rpc-client”的Namespace。然后在关联类型“rpc-client”的Namespace下修改配置项即可。这里有一点需要指出的，那就是rpc-client.jar是在应用容器里运行的，所以rpc-client获取到的“rpc-client” Namespace的配置是应用的关联类型的Namespace加上公共类型的Namespace。
#### 5.4 例子
如下图所示，有三个应用：应用A、应用B、应用C。
* 应用A有两个私有类型的Namespace：application和NS-Private，以及一个关联类型的Namespace：NS-Public。
* 应用B有一个私有类型的Namespace：application，以及一个公共类型的Namespace：NS-Public。
* 应用C只有一个私有类型的Namespace：application
##### 5.4.1 应用A获取Apollo配置
```java
//application
Config appConfig = ConfigService.getAppConfig();
appConfig.getProperty("k1", null); // k1 = v11
appConfig.getProperty("k2", null); // k2 = v21
//NS-Private
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.getProperty("k1", null); // k1 = v3
privateConfig.getProperty("k3", null); // k3 = v4
//NS-Public，覆盖公共类型配置的情况，k4被覆盖
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.getProperty("k4", null); // k4 = v6 cover
publicConfig.getProperty("k6", null); // k6 = v6
publicConfig.getProperty("k7", null); // k7 = v7
```
##### 5.4.2 应用B获取Apollo配置
```java
//application
Config appConfig = ConfigService.getAppConfig();
appConfig.getProperty("k1", null); // k1 = v12
appConfig.getProperty("k2", null); // k2 = null
appConfig.getProperty("k3", null); // k3 = v32
//NS-Private，由于没有NS-Private Namespace 所以获取到default value
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.getProperty("k1", "default value");
//NS-Public
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.getProperty("k4", null); // k4 = v5
publicConfig.getProperty("k6", null); // k6 = v6
publicConfig.getProperty("k7", null); // k7 = v7
```
##### 5.4.3 应用C获取Apollo配置
```java
//application
Config appConfig = ConfigService.getAppConfig();
appConfig.getProperty("k1", null); // k1 = v12
appConfig.getProperty("k2", null); // k2 = null
appConfig.getProperty("k3", null); // k3 = v33
//NS-Private，由于没有NS-Private Namespace 所以获取到default value
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.getProperty("k1", "default value");
//NS-Public，公共类型的Namespace，任何项目都可以获取到
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.getProperty("k4", null); // k4 = v5
publicConfig.getProperty("k6", null); // k6 = v6
publicConfig.getProperty("k7", null); // k7 = v7
```
##### 5.4.4 ChangeListener
以上代码例子中可以看到，在客户端Namespace映射成一个Config对象。Namespace配置变更的监听器是注册在Config对象上。
所以在应用A中监听application的Namespace代码如下：
```java
Config appConfig = ConfigService.getAppConfig();
appConfig.addChangeListener(new ConfigChangeListener() {
public void onChange(ConfigChangeEvent changeEvent) {
//do something
}
})
```
在应用A中监听NS-Private的Namespace代码如下：
```java
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.addChangeListener(new ConfigChangeListener() {
public void onChange(ConfigChangeEvent changeEvent) {
//do something
}
})
```
在应用A、应用B、应用C中监听NS-Public的Namespace代码如下：
```java
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.addChangeListener(new ConfigChangeListener() {
public void onChange(ConfigChangeEvent changeEvent) {
//do something
}
})
```
| ### 1. 什么是Namespace?
Namespace是配置项的集合，类似于一个配置文件的概念。
### 2. 什么是“application”的Namespace？
Apollo在创建项目的时候，都会默认创建一个“application”的Namespace。顾名思义，“application”是给应用自身使用的，熟悉Spring Boot的同学都知道，Spring Boot项目都有一个默认配置文件application.yml。在这里application.yml就等同于“application”的Namespace。对于90%的应用来说，“application”的Namespace已经满足日常配置使用场景了。
#### 客户端获取“application” Namespace的代码如下：
``` java
Config config = ConfigService.getAppConfig();
```
#### 客户端获取非“application” Namespace的代码如下：
``` java
Config config = ConfigService.getConfig(namespaceName);
```
### 3. Namespace的格式有哪些？
配置文件有多种格式，例如：properties、xml、yml、yaml、json等。同样Namespace也具有这些格式。在Portal UI中可以看到“application”的Namespace上有一个“properties”标签，表明“application”是properties格式的。
>注1：非properties格式的namespace，在客户端使用时需要调用`ConfigService.getConfigFile(String namespace, ConfigFileFormat configFileFormat)`来获取，如果使用[Http接口直接调用](zh/usage/other-language-client-user-guide#_12-通过带缓存的http接口从apollo读取配置)时，对应的namespace参数需要传入namespace的名字加上后缀名，如datasources.json。
>注2：apollo-client 1.3.0版本开始对yaml/yml做了更好的支持，使用起来和properties格式一致：`Config config = ConfigService.getConfig("application.yml");`，Spring的注入方式也和properties一致。
### 4. Namespace的获取权限分类
Namespace的获取权限分为两种：
* private （私有的）
* public （公共的）
这里的获取权限是相对于Apollo客户端来说的。
#### 4.1 private权限
private权限的Namespace，只能被所属的应用获取到。一个应用尝试获取其它应用private的Namespace，Apollo会报“404”异常。
#### 4.2 public权限
public权限的Namespace，能被任何应用获取。
### 5. Namespace的类型
Namespace类型有三种：
* 私有类型
* 公共类型
* 关联类型（继承类型）
#### 5.1 私有类型
私有类型的Namespace具有private权限。例如上文提到的“application” Namespace就是私有类型。
#### 5.2 公共类型
##### 5.2.1 含义
公共类型的Namespace具有public权限。公共类型的Namespace相当于游离于应用之外的配置，且通过Namespace的名称去标识公共Namespace，所以公共的Namespace的名称必须全局唯一。
##### 5.2.2 使用场景
* 部门级别共享的配置
* 小组级别共享的配置
* 几个项目之间共享的配置
* 中间件客户端的配置
#### 5.3 关联类型
##### 5.3.1 含义
关联类型又可称为继承类型，关联类型具有private权限。关联类型的Namespace继承于公共类型的Namespace，用于覆盖公共Namespace的某些配置。例如公共的Namespace有两个配置项
```
k1 = v1
k2 = v2
```
然后应用A有一个关联类型的Namespace关联了此公共Namespace，且覆盖了配置项k1，新值为v3。那么在应用A实际运行时，获取到的公共Namespace的配置为：
```
k1 = v3
k2 = v2
```
##### 5.3.2 使用场景
举一个实际使用的场景。假设RPC框架的配置（如：timeout）有以下要求：
* 提供一份全公司默认的配置且可动态调整
* RPC客户端项目可以自定义某些配置项且可动态调整
1. 如果把以上两点要求去掉“动态调整”，那么做法很简单。在rpc-client.jar包里有一份配置文件，每次修改配置文件然后重新发一个版本的jar包即可。同理，客户端项目修改配置也是如此。
2. 如果只支持客户端项目可动态调整配置。客户端项目可以在Apollo “application” Namespace上配置一些配置项。在初始化service的时候，从Apollo上读取配置即可。这样做的坏处就是，每个项目都要自定义一些key，不统一。
3. 那么如何完美支持以上需求呢？答案就是结合使用Apollo的公共类型的Namespace和关联类型的Namespace。RPC团队在Apollo上维护一个叫“rpc-client”的公共Namespace，在“rpc-client” Namespace上配置默认的参数值。rpc-client.jar里的代码读取“rpc-client”Namespace的配置即可。如果需要调整默认的配置，只需要修改公共类型“rpc-client” Namespace的配置。如果客户端项目想要自定义或动态修改某些配置项，只需要在Apollo 自己项目下关联“rpc-client”，就能创建关联类型“rpc-client”的Namespace。然后在关联类型“rpc-client”的Namespace下修改配置项即可。这里有一点需要指出的，那就是rpc-client.jar是在应用容器里运行的，所以rpc-client获取到的“rpc-client” Namespace的配置是应用的关联类型的Namespace加上公共类型的Namespace。
#### 5.4 例子
如下图所示，有三个应用：应用A、应用B、应用C。
* 应用A有两个私有类型的Namespace：application和NS-Private，以及一个关联类型的Namespace：NS-Public。
* 应用B有一个私有类型的Namespace：application，以及一个公共类型的Namespace：NS-Public。
* 应用C只有一个私有类型的Namespace：application
##### 5.4.1 应用A获取Apollo配置
```java
//application
Config appConfig = ConfigService.getAppConfig();
appConfig.getProperty("k1", null); // k1 = v11
appConfig.getProperty("k2", null); // k2 = v21
//NS-Private
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.getProperty("k1", null); // k1 = v3
privateConfig.getProperty("k3", null); // k3 = v4
//NS-Public，覆盖公共类型配置的情况，k4被覆盖
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.getProperty("k4", null); // k4 = v6 cover
publicConfig.getProperty("k6", null); // k6 = v6
publicConfig.getProperty("k7", null); // k7 = v7
```
##### 5.4.2 应用B获取Apollo配置
```java
//application
Config appConfig = ConfigService.getAppConfig();
appConfig.getProperty("k1", null); // k1 = v12
appConfig.getProperty("k2", null); // k2 = null
appConfig.getProperty("k3", null); // k3 = v32
//NS-Private，由于没有NS-Private Namespace 所以获取到default value
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.getProperty("k1", "default value");
//NS-Public
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.getProperty("k4", null); // k4 = v5
publicConfig.getProperty("k6", null); // k6 = v6
publicConfig.getProperty("k7", null); // k7 = v7
```
##### 5.4.3 应用C获取Apollo配置
```java
//application
Config appConfig = ConfigService.getAppConfig();
appConfig.getProperty("k1", null); // k1 = v12
appConfig.getProperty("k2", null); // k2 = null
appConfig.getProperty("k3", null); // k3 = v33
//NS-Private，由于没有NS-Private Namespace 所以获取到default value
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.getProperty("k1", "default value");
//NS-Public，公共类型的Namespace，任何项目都可以获取到
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.getProperty("k4", null); // k4 = v5
publicConfig.getProperty("k6", null); // k6 = v6
publicConfig.getProperty("k7", null); // k7 = v7
```
##### 5.4.4 ChangeListener
以上代码例子中可以看到，在客户端Namespace映射成一个Config对象。Namespace配置变更的监听器是注册在Config对象上。
所以在应用A中监听application的Namespace代码如下：
```java
Config appConfig = ConfigService.getAppConfig();
appConfig.addChangeListener(new ConfigChangeListener() {
public void onChange(ConfigChangeEvent changeEvent) {
//do something
}
})
```
在应用A中监听NS-Private的Namespace代码如下：
```java
Config privateConfig = ConfigService.getConfig("NS-Private");
privateConfig.addChangeListener(new ConfigChangeListener() {
public void onChange(ConfigChangeEvent changeEvent) {
//do something
}
})
```
在应用A、应用B、应用C中监听NS-Public的Namespace代码如下：
```java
Config publicConfig = ConfigService.getConfig("NS-Public");
publicConfig.addChangeListener(new ConfigChangeListener() {
public void onChange(ConfigChangeEvent changeEvent) {
//do something
}
})
```
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/configservice/filter/ClientAuthenticationFilter.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.filter;
import com.ctrip.framework.apollo.configservice.util.AccessKeyUtil;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.net.HttpHeaders;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
/**
* @author nisiyong
*/
public class ClientAuthenticationFilter implements Filter {
private static final Logger logger = LoggerFactory.getLogger(ClientAuthenticationFilter.class);
private static final Long TIMESTAMP_INTERVAL = 60 * 1000L;
private final AccessKeyUtil accessKeyUtil;
public ClientAuthenticationFilter(AccessKeyUtil accessKeyUtil) {
this.accessKeyUtil = accessKeyUtil;
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
//nothing
}
@Override
public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain)
throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) resp;
String appId = accessKeyUtil.extractAppIdFromRequest(request);
if (StringUtils.isBlank(appId)) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "InvalidAppId");
return;
}
List<String> availableSecrets = accessKeyUtil.findAvailableSecret(appId);
if (!CollectionUtils.isEmpty(availableSecrets)) {
String timestamp = request.getHeader(Signature.HTTP_HEADER_TIMESTAMP);
String authorization = request.getHeader(HttpHeaders.AUTHORIZATION);
// check timestamp, valid within 1 minute
if (!checkTimestamp(timestamp)) {
logger.warn("Invalid timestamp. appId={},timestamp={}", appId, timestamp);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "RequestTimeTooSkewed");
return;
}
// check signature
String uri = request.getRequestURI();
String query = request.getQueryString();
if (!checkAuthorization(authorization, availableSecrets, timestamp, uri, query)) {
logger.warn("Invalid authorization. appId={},authorization={}", appId, authorization);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
return;
}
}
chain.doFilter(request, response);
}
@Override
public void destroy() {
//nothing
}
private boolean checkTimestamp(String timestamp) {
long requestTimeMillis = 0L;
try {
requestTimeMillis = Long.parseLong(timestamp);
} catch (NumberFormatException e) {
// nothing to do
}
long x = System.currentTimeMillis() - requestTimeMillis;
return x >= -TIMESTAMP_INTERVAL && x <= TIMESTAMP_INTERVAL;
}
private boolean checkAuthorization(String authorization, List<String> availableSecrets,
String timestamp, String path, String query) {
String signature = null;
if (authorization != null) {
String[] split = authorization.split(":");
if (split.length > 1) {
signature = split[1];
}
}
for (String secret : availableSecrets) {
String availableSignature = accessKeyUtil.buildSignature(path, query, timestamp, secret);
if (Objects.equals(signature, availableSignature)) {
return true;
}
}
return false;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.filter;
import com.ctrip.framework.apollo.configservice.util.AccessKeyUtil;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import com.google.common.net.HttpHeaders;
import java.io.IOException;
import java.util.List;
import java.util.Objects;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
/**
* @author nisiyong
*/
public class ClientAuthenticationFilter implements Filter {
private static final Logger logger = LoggerFactory.getLogger(ClientAuthenticationFilter.class);
private static final Long TIMESTAMP_INTERVAL = 60 * 1000L;
private final AccessKeyUtil accessKeyUtil;
public ClientAuthenticationFilter(AccessKeyUtil accessKeyUtil) {
this.accessKeyUtil = accessKeyUtil;
}
@Override
public void init(FilterConfig filterConfig) throws ServletException {
//nothing
}
@Override
public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain)
throws IOException, ServletException {
HttpServletRequest request = (HttpServletRequest) req;
HttpServletResponse response = (HttpServletResponse) resp;
String appId = accessKeyUtil.extractAppIdFromRequest(request);
if (StringUtils.isBlank(appId)) {
response.sendError(HttpServletResponse.SC_BAD_REQUEST, "InvalidAppId");
return;
}
List<String> availableSecrets = accessKeyUtil.findAvailableSecret(appId);
if (!CollectionUtils.isEmpty(availableSecrets)) {
String timestamp = request.getHeader(Signature.HTTP_HEADER_TIMESTAMP);
String authorization = request.getHeader(HttpHeaders.AUTHORIZATION);
// check timestamp, valid within 1 minute
if (!checkTimestamp(timestamp)) {
logger.warn("Invalid timestamp. appId={},timestamp={}", appId, timestamp);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "RequestTimeTooSkewed");
return;
}
// check signature
String uri = request.getRequestURI();
String query = request.getQueryString();
if (!checkAuthorization(authorization, availableSecrets, timestamp, uri, query)) {
logger.warn("Invalid authorization. appId={},authorization={}", appId, authorization);
response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Unauthorized");
return;
}
}
chain.doFilter(request, response);
}
@Override
public void destroy() {
//nothing
}
private boolean checkTimestamp(String timestamp) {
long requestTimeMillis = 0L;
try {
requestTimeMillis = Long.parseLong(timestamp);
} catch (NumberFormatException e) {
// nothing to do
}
long x = System.currentTimeMillis() - requestTimeMillis;
return x >= -TIMESTAMP_INTERVAL && x <= TIMESTAMP_INTERVAL;
}
private boolean checkAuthorization(String authorization, List<String> availableSecrets,
String timestamp, String path, String query) {
String signature = null;
if (authorization != null) {
String[] split = authorization.split(":");
if (split.length > 1) {
signature = split[1];
}
}
for (String secret : availableSecrets) {
String availableSignature = accessKeyUtil.buildSignature(path, query, timestamp, secret);
if (Objects.equals(signature, availableSignature)) {
return true;
}
}
return false;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/SsoHeartbeatController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.portal.spi.SsoHeartbeatHandler;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Since sso auth information has a limited expiry time, so we need to do sso heartbeat to keep the
* information refreshed when unavailable
*
* @author Jason Song(song_s@ctrip.com)
*/
@Controller
@RequestMapping("/sso_heartbeat")
public class SsoHeartbeatController {
private final SsoHeartbeatHandler handler;
public SsoHeartbeatController(final SsoHeartbeatHandler handler) {
this.handler = handler;
}
@GetMapping
public void heartbeat(HttpServletRequest request, HttpServletResponse response) {
handler.doHeartbeat(request, response);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.portal.spi.SsoHeartbeatHandler;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* Since sso auth information has a limited expiry time, so we need to do sso heartbeat to keep the
* information refreshed when unavailable
*
* @author Jason Song(song_s@ctrip.com)
*/
@Controller
@RequestMapping("/sso_heartbeat")
public class SsoHeartbeatController {
private final SsoHeartbeatHandler handler;
public SsoHeartbeatController(final SsoHeartbeatHandler handler) {
this.handler = handler;
}
@GetMapping
public void heartbeat(HttpServletRequest request, HttpServletResponse response) {
handler.doHeartbeat(request, response);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/spring/spi/TestProcessorHelper.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public class TestProcessorHelper extends DefaultConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
throws BeansException {
super.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return 0;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.spi;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
public class TestProcessorHelper extends DefaultConfigPropertySourcesProcessorHelper {
@Override
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry)
throws BeansException {
super.postProcessBeanDefinitionRegistry(registry);
}
@Override
public int getOrder() {
return 0;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/tracer/TracerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer;
import com.ctrip.framework.apollo.tracer.internals.MockMessageProducerManager;
import com.ctrip.framework.apollo.tracer.internals.NullTransaction;
import com.ctrip.framework.apollo.tracer.spi.MessageProducer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class TracerTest {
private MessageProducer someProducer;
@Before
public void setUp() throws Exception {
someProducer = mock(MessageProducer.class);
MockMessageProducerManager.setProducer(someProducer);
}
@Test
public void testLogError() throws Exception {
String someMessage = "someMessage";
Throwable someCause = mock(Throwable.class);
Tracer.logError(someMessage, someCause);
verify(someProducer, times(1)).logError(someMessage, someCause);
}
@Test
public void testLogErrorWithException() throws Exception {
String someMessage = "someMessage";
Throwable someCause = mock(Throwable.class);
doThrow(RuntimeException.class).when(someProducer).logError(someMessage, someCause);
Tracer.logError(someMessage, someCause);
verify(someProducer, times(1)).logError(someMessage, someCause);
}
@Test
public void testLogErrorWithOnlyCause() throws Exception {
Throwable someCause = mock(Throwable.class);
Tracer.logError(someCause);
verify(someProducer, times(1)).logError(someCause);
}
@Test
public void testLogErrorWithOnlyCauseWithException() throws Exception {
Throwable someCause = mock(Throwable.class);
doThrow(RuntimeException.class).when(someProducer).logError(someCause);
Tracer.logError(someCause);
verify(someProducer, times(1)).logError(someCause);
}
@Test
public void testLogEvent() throws Exception {
String someType = "someType";
String someName = "someName";
Tracer.logEvent(someType, someName);
verify(someProducer, times(1)).logEvent(someType, someName);
}
@Test
public void testLogEventWithException() throws Exception {
String someType = "someType";
String someName = "someName";
doThrow(RuntimeException.class).when(someProducer).logEvent(someType, someName);
Tracer.logEvent(someType, someName);
verify(someProducer, times(1)).logEvent(someType, someName);
}
@Test
public void testLogEventWithStatusAndNameValuePairs() throws Exception {
String someType = "someType";
String someName = "someName";
String someStatus = "someStatus";
String someNameValuePairs = "someNameValuePairs";
Tracer.logEvent(someType, someName, someStatus, someNameValuePairs);
verify(someProducer, times(1)).logEvent(someType, someName, someStatus, someNameValuePairs);
}
@Test
public void testLogEventWithStatusAndNameValuePairsWithException() throws Exception {
String someType = "someType";
String someName = "someName";
String someStatus = "someStatus";
String someNameValuePairs = "someNameValuePairs";
doThrow(RuntimeException.class).when(someProducer).logEvent(someType, someName, someStatus,
someNameValuePairs);
Tracer.logEvent(someType, someName, someStatus, someNameValuePairs);
verify(someProducer, times(1)).logEvent(someType, someName, someStatus, someNameValuePairs);
}
@Test
public void testNewTransaction() throws Exception {
String someType = "someType";
String someName = "someName";
Transaction someTransaction = mock(Transaction.class);
when(someProducer.newTransaction(someType, someName)).thenReturn(someTransaction);
Transaction result = Tracer.newTransaction(someType, someName);
verify(someProducer, times(1)).newTransaction(someType, someName);
assertEquals(someTransaction, result);
}
@Test
public void testNewTransactionWithException() throws Exception {
String someType = "someType";
String someName = "someName";
when(someProducer.newTransaction(someType, someName)).thenThrow(RuntimeException.class);
Transaction result = Tracer.newTransaction(someType, someName);
verify(someProducer, times(1)).newTransaction(someType, someName);
assertTrue(result instanceof NullTransaction);
}
} | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.tracer;
import com.ctrip.framework.apollo.tracer.internals.MockMessageProducerManager;
import com.ctrip.framework.apollo.tracer.internals.NullTransaction;
import com.ctrip.framework.apollo.tracer.spi.MessageProducer;
import com.ctrip.framework.apollo.tracer.spi.Transaction;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class TracerTest {
private MessageProducer someProducer;
@Before
public void setUp() throws Exception {
someProducer = mock(MessageProducer.class);
MockMessageProducerManager.setProducer(someProducer);
}
@Test
public void testLogError() throws Exception {
String someMessage = "someMessage";
Throwable someCause = mock(Throwable.class);
Tracer.logError(someMessage, someCause);
verify(someProducer, times(1)).logError(someMessage, someCause);
}
@Test
public void testLogErrorWithException() throws Exception {
String someMessage = "someMessage";
Throwable someCause = mock(Throwable.class);
doThrow(RuntimeException.class).when(someProducer).logError(someMessage, someCause);
Tracer.logError(someMessage, someCause);
verify(someProducer, times(1)).logError(someMessage, someCause);
}
@Test
public void testLogErrorWithOnlyCause() throws Exception {
Throwable someCause = mock(Throwable.class);
Tracer.logError(someCause);
verify(someProducer, times(1)).logError(someCause);
}
@Test
public void testLogErrorWithOnlyCauseWithException() throws Exception {
Throwable someCause = mock(Throwable.class);
doThrow(RuntimeException.class).when(someProducer).logError(someCause);
Tracer.logError(someCause);
verify(someProducer, times(1)).logError(someCause);
}
@Test
public void testLogEvent() throws Exception {
String someType = "someType";
String someName = "someName";
Tracer.logEvent(someType, someName);
verify(someProducer, times(1)).logEvent(someType, someName);
}
@Test
public void testLogEventWithException() throws Exception {
String someType = "someType";
String someName = "someName";
doThrow(RuntimeException.class).when(someProducer).logEvent(someType, someName);
Tracer.logEvent(someType, someName);
verify(someProducer, times(1)).logEvent(someType, someName);
}
@Test
public void testLogEventWithStatusAndNameValuePairs() throws Exception {
String someType = "someType";
String someName = "someName";
String someStatus = "someStatus";
String someNameValuePairs = "someNameValuePairs";
Tracer.logEvent(someType, someName, someStatus, someNameValuePairs);
verify(someProducer, times(1)).logEvent(someType, someName, someStatus, someNameValuePairs);
}
@Test
public void testLogEventWithStatusAndNameValuePairsWithException() throws Exception {
String someType = "someType";
String someName = "someName";
String someStatus = "someStatus";
String someNameValuePairs = "someNameValuePairs";
doThrow(RuntimeException.class).when(someProducer).logEvent(someType, someName, someStatus,
someNameValuePairs);
Tracer.logEvent(someType, someName, someStatus, someNameValuePairs);
verify(someProducer, times(1)).logEvent(someType, someName, someStatus, someNameValuePairs);
}
@Test
public void testNewTransaction() throws Exception {
String someType = "someType";
String someName = "someName";
Transaction someTransaction = mock(Transaction.class);
when(someProducer.newTransaction(someType, someName)).thenReturn(someTransaction);
Transaction result = Tracer.newTransaction(someType, someName);
verify(someProducer, times(1)).newTransaction(someType, someName);
assertEquals(someTransaction, result);
}
@Test
public void testNewTransactionWithException() throws Exception {
String someType = "someType";
String someName = "someName";
when(someProducer.newTransaction(someType, someName)).thenThrow(RuntimeException.class);
Transaction result = Tracer.newTransaction(someType, someName);
verify(someProducer, times(1)).newTransaction(someType, someName);
assertTrue(result instanceof NullTransaction);
}
} | -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/test/java/com/ctrip/framework/apollo/openapi/filter/ConsumerAuthenticationFilterTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.filter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpHeaders;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConsumerAuthenticationFilterTest {
private ConsumerAuthenticationFilter authenticationFilter;
@Mock
private ConsumerAuthUtil consumerAuthUtil;
@Mock
private ConsumerAuditUtil consumerAuditUtil;
@Mock
private HttpServletRequest request;
@Mock
private HttpServletResponse response;
@Mock
private FilterChain filterChain;
@Before
public void setUp() throws Exception {
authenticationFilter = new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil);
}
@Test
public void testAuthSuccessfully() throws Exception {
String someToken = "someToken";
Long someConsumerId = 1L;
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someToken);
when(consumerAuthUtil.getConsumerId(someToken)).thenReturn(someConsumerId);
authenticationFilter.doFilter(request, response, filterChain);
verify(consumerAuthUtil, times(1)).storeConsumerId(request, someConsumerId);
verify(consumerAuditUtil, times(1)).audit(request, someConsumerId);
verify(filterChain, times(1)).doFilter(request, response);
}
@Test
public void testAuthFailed() throws Exception {
String someInvalidToken = "someInvalidToken";
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someInvalidToken);
when(consumerAuthUtil.getConsumerId(someInvalidToken)).thenReturn(null);
authenticationFilter.doFilter(request, response, filterChain);
verify(response, times(1)).sendError(eq(HttpServletResponse.SC_UNAUTHORIZED), anyString());
verify(consumerAuthUtil, never()).storeConsumerId(eq(request), anyLong());
verify(consumerAuditUtil, never()).audit(eq(request), anyLong());
verify(filterChain, never()).doFilter(request, response);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.filter;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuditUtil;
import com.ctrip.framework.apollo.openapi.util.ConsumerAuthUtil;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import javax.servlet.FilterChain;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.http.HttpHeaders;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class ConsumerAuthenticationFilterTest {
private ConsumerAuthenticationFilter authenticationFilter;
@Mock
private ConsumerAuthUtil consumerAuthUtil;
@Mock
private ConsumerAuditUtil consumerAuditUtil;
@Mock
private HttpServletRequest request;
@Mock
private HttpServletResponse response;
@Mock
private FilterChain filterChain;
@Before
public void setUp() throws Exception {
authenticationFilter = new ConsumerAuthenticationFilter(consumerAuthUtil, consumerAuditUtil);
}
@Test
public void testAuthSuccessfully() throws Exception {
String someToken = "someToken";
Long someConsumerId = 1L;
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someToken);
when(consumerAuthUtil.getConsumerId(someToken)).thenReturn(someConsumerId);
authenticationFilter.doFilter(request, response, filterChain);
verify(consumerAuthUtil, times(1)).storeConsumerId(request, someConsumerId);
verify(consumerAuditUtil, times(1)).audit(request, someConsumerId);
verify(filterChain, times(1)).doFilter(request, response);
}
@Test
public void testAuthFailed() throws Exception {
String someInvalidToken = "someInvalidToken";
when(request.getHeader(HttpHeaders.AUTHORIZATION)).thenReturn(someInvalidToken);
when(consumerAuthUtil.getConsumerId(someInvalidToken)).thenReturn(null);
authenticationFilter.doFilter(request, response, filterChain);
verify(response, times(1)).sendError(eq(HttpServletResponse.SC_UNAUTHORIZED), anyString());
verify(consumerAuthUtil, never()).storeConsumerId(eq(request), anyLong());
verify(consumerAuditUtil, never()).audit(eq(request), anyLong());
verify(filterChain, never()).doFilter(request, response);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/utils/InputValidator.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import java.util.regex.Pattern;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class InputValidator {
public static final String INVALID_CLUSTER_NAMESPACE_MESSAGE = "Only digits, alphabets and symbol - _ . are allowed";
public static final String INVALID_NAMESPACE_NAMESPACE_MESSAGE = "not allowed to end with .json, .yml, .yaml, .xml, .properties";
public static final String CLUSTER_NAMESPACE_VALIDATOR = "[0-9a-zA-Z_.-]+";
private static final String APP_NAMESPACE_VALIDATOR = "[a-zA-Z0-9._-]+(?<!\\.(json|yml|yaml|xml|properties))$";
private static final Pattern CLUSTER_NAMESPACE_PATTERN = Pattern.compile(CLUSTER_NAMESPACE_VALIDATOR);
private static final Pattern APP_NAMESPACE_PATTERN = Pattern.compile(APP_NAMESPACE_VALIDATOR);
public static boolean isValidClusterNamespace(String name) {
if (StringUtils.isEmpty(name)){
return false;
}
return CLUSTER_NAMESPACE_PATTERN.matcher(name).matches();
}
public static boolean isValidAppNamespace(String name){
if (StringUtils.isEmpty(name)){
return false;
}
return APP_NAMESPACE_PATTERN.matcher(name).matches();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.utils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import java.util.regex.Pattern;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class InputValidator {
public static final String INVALID_CLUSTER_NAMESPACE_MESSAGE = "Only digits, alphabets and symbol - _ . are allowed";
public static final String INVALID_NAMESPACE_NAMESPACE_MESSAGE = "not allowed to end with .json, .yml, .yaml, .xml, .properties";
public static final String CLUSTER_NAMESPACE_VALIDATOR = "[0-9a-zA-Z_.-]+";
private static final String APP_NAMESPACE_VALIDATOR = "[a-zA-Z0-9._-]+(?<!\\.(json|yml|yaml|xml|properties))$";
private static final Pattern CLUSTER_NAMESPACE_PATTERN = Pattern.compile(CLUSTER_NAMESPACE_VALIDATOR);
private static final Pattern APP_NAMESPACE_PATTERN = Pattern.compile(APP_NAMESPACE_VALIDATOR);
public static boolean isValidClusterNamespace(String name) {
if (StringUtils.isEmpty(name)){
return false;
}
return CLUSTER_NAMESPACE_PATTERN.matcher(name).matches();
}
public static boolean isValidAppNamespace(String name){
if (StringUtils.isEmpty(name)){
return false;
}
return APP_NAMESPACE_PATTERN.matcher(name).matches();
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/util/http/HttpResponse.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.http;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class HttpResponse<T> {
private final int m_statusCode;
private final T m_body;
public HttpResponse(int statusCode, T body) {
this.m_statusCode = statusCode;
this.m_body = body;
}
public int getStatusCode() {
return m_statusCode;
}
public T getBody() {
return m_body;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.util.http;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class HttpResponse<T> {
private final int m_statusCode;
private final T m_body;
public HttpResponse(int statusCode, T body) {
this.m_statusCode = statusCode;
this.m_body = body;
}
public int getStatusCode() {
return m_statusCode;
}
public T getBody() {
return m_body;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/util/InstanceConfigAuditUtilTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.util;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.service.InstanceService;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.Objects;
import java.util.concurrent.BlockingQueue;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class InstanceConfigAuditUtilTest {
private InstanceConfigAuditUtil instanceConfigAuditUtil;
@Mock
private InstanceService instanceService;
private BlockingQueue<InstanceConfigAuditUtil.InstanceConfigAuditModel> audits;
private String someAppId;
private String someConfigClusterName;
private String someClusterName;
private String someDataCenter;
private String someIp;
private String someConfigAppId;
private String someConfigNamespace;
private String someReleaseKey;
private InstanceConfigAuditUtil.InstanceConfigAuditModel someAuditModel;
@Before
public void setUp() throws Exception {
instanceConfigAuditUtil = new InstanceConfigAuditUtil(instanceService);
audits = (BlockingQueue<InstanceConfigAuditUtil.InstanceConfigAuditModel>)
ReflectionTestUtils.getField(instanceConfigAuditUtil, "audits");
someAppId = "someAppId";
someClusterName = "someClusterName";
someDataCenter = "someDataCenter";
someIp = "someIp";
someConfigAppId = "someConfigAppId";
someConfigClusterName = "someConfigClusterName";
someConfigNamespace = "someConfigNamespace";
someReleaseKey = "someReleaseKey";
someAuditModel = new InstanceConfigAuditUtil.InstanceConfigAuditModel(someAppId,
someClusterName, someDataCenter, someIp, someConfigAppId, someConfigClusterName,
someConfigNamespace, someReleaseKey);
}
@Test
public void testAudit() throws Exception {
boolean result = instanceConfigAuditUtil.audit(someAppId, someClusterName, someDataCenter,
someIp, someConfigAppId, someConfigClusterName, someConfigNamespace, someReleaseKey);
InstanceConfigAuditUtil.InstanceConfigAuditModel audit = audits.poll();
assertTrue(result);
assertTrue(Objects.equals(someAuditModel, audit));
}
@Test
public void testDoAudit() throws Exception {
long someInstanceId = 1;
Instance someInstance = mock(Instance.class);
when(someInstance.getId()).thenReturn(someInstanceId);
when(instanceService.createInstance(any(Instance.class))).thenReturn(someInstance);
instanceConfigAuditUtil.doAudit(someAuditModel);
verify(instanceService, times(1)).findInstance(someAppId, someClusterName, someDataCenter,
someIp);
verify(instanceService, times(1)).createInstance(any(Instance.class));
verify(instanceService, times(1)).findInstanceConfig(someInstanceId, someConfigAppId,
someConfigNamespace);
verify(instanceService, times(1)).createInstanceConfig(any(InstanceConfig.class));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.util;
import com.ctrip.framework.apollo.biz.entity.Instance;
import com.ctrip.framework.apollo.biz.entity.InstanceConfig;
import com.ctrip.framework.apollo.biz.service.InstanceService;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
import org.springframework.test.util.ReflectionTestUtils;
import java.util.Objects;
import java.util.concurrent.BlockingQueue;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.*;
/**
* @author Jason Song(song_s@ctrip.com)
*/
@RunWith(MockitoJUnitRunner.class)
public class InstanceConfigAuditUtilTest {
private InstanceConfigAuditUtil instanceConfigAuditUtil;
@Mock
private InstanceService instanceService;
private BlockingQueue<InstanceConfigAuditUtil.InstanceConfigAuditModel> audits;
private String someAppId;
private String someConfigClusterName;
private String someClusterName;
private String someDataCenter;
private String someIp;
private String someConfigAppId;
private String someConfigNamespace;
private String someReleaseKey;
private InstanceConfigAuditUtil.InstanceConfigAuditModel someAuditModel;
@Before
public void setUp() throws Exception {
instanceConfigAuditUtil = new InstanceConfigAuditUtil(instanceService);
audits = (BlockingQueue<InstanceConfigAuditUtil.InstanceConfigAuditModel>)
ReflectionTestUtils.getField(instanceConfigAuditUtil, "audits");
someAppId = "someAppId";
someClusterName = "someClusterName";
someDataCenter = "someDataCenter";
someIp = "someIp";
someConfigAppId = "someConfigAppId";
someConfigClusterName = "someConfigClusterName";
someConfigNamespace = "someConfigNamespace";
someReleaseKey = "someReleaseKey";
someAuditModel = new InstanceConfigAuditUtil.InstanceConfigAuditModel(someAppId,
someClusterName, someDataCenter, someIp, someConfigAppId, someConfigClusterName,
someConfigNamespace, someReleaseKey);
}
@Test
public void testAudit() throws Exception {
boolean result = instanceConfigAuditUtil.audit(someAppId, someClusterName, someDataCenter,
someIp, someConfigAppId, someConfigClusterName, someConfigNamespace, someReleaseKey);
InstanceConfigAuditUtil.InstanceConfigAuditModel audit = audits.poll();
assertTrue(result);
assertTrue(Objects.equals(someAuditModel, audit));
}
@Test
public void testDoAudit() throws Exception {
long someInstanceId = 1;
Instance someInstance = mock(Instance.class);
when(someInstance.getId()).thenReturn(someInstanceId);
when(instanceService.createInstance(any(Instance.class))).thenReturn(someInstance);
instanceConfigAuditUtil.doAudit(someAuditModel);
verify(instanceService, times(1)).findInstance(someAppId, someClusterName, someDataCenter,
someIp);
verify(instanceService, times(1)).createInstance(any(Instance.class));
verify(instanceService, times(1)).findInstanceConfig(someInstanceId, someConfigAppId,
someConfigNamespace);
verify(instanceService, times(1)).createInstanceConfig(any(InstanceConfig.class));
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/java/com/ctrip/framework/apollo/internals/RemoteConfigRepositoryTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import com.google.common.net.UrlEscapers;
import com.google.common.util.concurrent.SettableFuture;
import com.google.gson.Gson;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
@RunWith(MockitoJUnitRunner.class)
public class RemoteConfigRepositoryTest {
@Mock
private ConfigServiceLocator configServiceLocator;
private String someNamespace;
private String someServerUrl;
private ConfigUtil configUtil;
private HttpClient httpClient;
@Mock
private static HttpResponse<ApolloConfig> someResponse;
@Mock
private static HttpResponse<List<ApolloConfigNotification>> pollResponse;
private RemoteConfigLongPollService remoteConfigLongPollService;
@Mock
private PropertiesFactory propertiesFactory;
private static String someAppId;
private static String someCluster;
private static String someSecret;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_NOT_MODIFIED);
configUtil = new MockConfigUtil();
MockInjector.setInstance(ConfigUtil.class, configUtil);
someServerUrl = "http://someServer";
ServiceDTO serviceDTO = mock(ServiceDTO.class);
when(serviceDTO.getHomepageUrl()).thenReturn(someServerUrl);
when(configServiceLocator.getConfigServices()).thenReturn(Lists.newArrayList(serviceDTO));
MockInjector.setInstance(ConfigServiceLocator.class, configServiceLocator);
httpClient = spy(new MockHttpClient());
MockInjector.setInstance(HttpClient.class, httpClient);
remoteConfigLongPollService = new RemoteConfigLongPollService();
MockInjector.setInstance(RemoteConfigLongPollService.class, remoteConfigLongPollService);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someAppId = "someAppId";
someCluster = "someCluster";
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testLoadConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLoadConfigWithOrderedProperties() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newLinkedHashMap();
configurations.put(someKey, someValue);
configurations.put("someKey2", "someValue2");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertTrue(config instanceof OrderedProperties);
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
String[] actualArrays = config.keySet().toArray(new String[]{});
String[] expectedArrays = {"someKey", "someKey2"};
assertArrayEquals(expectedArrays, actualArrays);
}
@Test
public void testLoadConfigWithAccessKeySecret() throws Exception {
someSecret = "someSecret";
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
doAnswer(new Answer<HttpResponse<ApolloConfig>>() {
@Override
public HttpResponse<ApolloConfig> answer(InvocationOnMock invocation) throws Throwable {
HttpRequest request = invocation.getArgumentAt(0, HttpRequest.class);
Map<String, String> headers = request.getHeaders();
assertNotNull(headers);
assertTrue(headers.containsKey(Signature.HTTP_HEADER_TIMESTAMP));
assertTrue(headers.containsKey(HttpHeaders.AUTHORIZATION));
return someResponse;
}
}).when(httpClient).doGet(any(HttpRequest.class), any(Class.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithServerError() throws Exception {
when(someResponse.getStatusCode()).thenReturn(500);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithNotFount() throws Exception {
when(someResponse.getStatusCode()).thenReturn(404);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test
public void testRepositoryChangeListener() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
when(someResponse.getBody()).thenReturn(newApolloConfig);
remoteConfigRepository.sync();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLongPollingRefresh() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
longPollFinished.set(true);
return null;
}
}).when(someListener).onRepositoryChange(any(String.class), any(Properties.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
notificationMessages.put(someKey, someNotificationId);
ApolloConfigNotification someNotification = mock(ApolloConfigNotification.class);
when(someNotification.getNamespaceName()).thenReturn(someNamespace);
when(someNotification.getMessages()).thenReturn(notificationMessages);
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_OK);
when(pollResponse.getBody()).thenReturn(Lists.newArrayList(someNotification));
when(someResponse.getBody()).thenReturn(newApolloConfig);
longPollFinished.get(30_000, TimeUnit.MILLISECONDS);
remoteConfigLongPollService.stopLongPollingRefresh();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
final ArgumentCaptor<HttpRequest> httpRequestArgumentCaptor = ArgumentCaptor
.forClass(HttpRequest.class);
verify(httpClient, atLeast(2)).doGet(httpRequestArgumentCaptor.capture(), eq(ApolloConfig.class));
HttpRequest request = httpRequestArgumentCaptor.getValue();
assertTrue(request.getUrl().contains("messages=%7B%22details%22%3A%7B%22someKey%22%3A1%7D%7D"));
}
@Test
public void testAssembleQueryConfigUrl() throws Exception {
Gson gson = new Gson();
String someUri = "http://someServer";
String someAppId = "someAppId";
String someCluster = "someCluster+ &.-_someSign";
String someReleaseKey = "20160705193346-583078ef5716c055+20160705193308-31c471ddf9087c3f";
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
String anotherKey = "anotherKey";
long anotherNotificationId = 2;
notificationMessages.put(someKey, someNotificationId);
notificationMessages.put(anotherKey, anotherNotificationId);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
ApolloConfig someApolloConfig = mock(ApolloConfig.class);
when(someApolloConfig.getReleaseKey()).thenReturn(someReleaseKey);
String queryConfigUrl = remoteConfigRepository
.assembleQueryConfigUrl(someUri, someAppId, someCluster, someNamespace, null,
notificationMessages,
someApolloConfig);
remoteConfigLongPollService.stopLongPollingRefresh();
assertTrue(queryConfigUrl
.contains(
"http://someServer/configs/someAppId/someCluster+%20&.-_someSign/" + someNamespace));
assertTrue(queryConfigUrl
.contains("releaseKey=20160705193346-583078ef5716c055%2B20160705193308-31c471ddf9087c3f"));
assertTrue(queryConfigUrl
.contains("messages=" + UrlEscapers.urlFormParameterEscaper()
.escape(gson.toJson(notificationMessages))));
}
private ApolloConfig assembleApolloConfig(Map<String, String> configurations) {
String someAppId = "appId";
String someClusterName = "cluster";
String someReleaseKey = "1";
ApolloConfig apolloConfig =
new ApolloConfig(someAppId, someClusterName, someNamespace, someReleaseKey);
apolloConfig.setConfigurations(configurations);
return apolloConfig;
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
@Override
public String getAccessKeySecret() {
return someSecret;
}
@Override
public String getDataCenter() {
return null;
}
@Override
public int getLoadConfigQPS() {
return 200;
}
@Override
public int getLongPollQPS() {
return 200;
}
@Override
public long getOnErrorRetryInterval() {
return 10;
}
@Override
public TimeUnit getOnErrorRetryIntervalTimeUnit() {
return TimeUnit.MILLISECONDS;
}
@Override
public long getLongPollingInitialDelayInMills() {
return 0;
}
}
public static class MockHttpClient implements HttpClient {
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Class<T> responseType) {
if (someResponse.getStatusCode() == 200 || someResponse.getStatusCode() == 304) {
return (HttpResponse<T>) someResponse;
}
throw new ApolloConfigStatusCodeException(someResponse.getStatusCode(),
String.format("Http request failed due to status code: %d",
someResponse.getStatusCode()));
}
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Type responseType) {
try {
TimeUnit.MILLISECONDS.sleep(50);
} catch (InterruptedException e) {
}
return (HttpResponse<T>) pollResponse;
}
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.atLeast;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.build.MockInjector;
import com.ctrip.framework.apollo.core.dto.ApolloConfig;
import com.ctrip.framework.apollo.core.dto.ApolloConfigNotification;
import com.ctrip.framework.apollo.core.dto.ApolloNotificationMessages;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.core.signature.Signature;
import com.ctrip.framework.apollo.enums.ConfigSourceType;
import com.ctrip.framework.apollo.exceptions.ApolloConfigException;
import com.ctrip.framework.apollo.exceptions.ApolloConfigStatusCodeException;
import com.ctrip.framework.apollo.util.ConfigUtil;
import com.ctrip.framework.apollo.util.OrderedProperties;
import com.ctrip.framework.apollo.util.factory.PropertiesFactory;
import com.ctrip.framework.apollo.util.http.HttpRequest;
import com.ctrip.framework.apollo.util.http.HttpResponse;
import com.ctrip.framework.apollo.util.http.HttpClient;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.net.HttpHeaders;
import com.google.common.net.UrlEscapers;
import com.google.common.util.concurrent.SettableFuture;
import com.google.gson.Gson;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
import javax.servlet.http.HttpServletResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.runners.MockitoJUnitRunner;
import org.mockito.stubbing.Answer;
/**
* Created by Jason on 4/9/16.
*/
@RunWith(MockitoJUnitRunner.class)
public class RemoteConfigRepositoryTest {
@Mock
private ConfigServiceLocator configServiceLocator;
private String someNamespace;
private String someServerUrl;
private ConfigUtil configUtil;
private HttpClient httpClient;
@Mock
private static HttpResponse<ApolloConfig> someResponse;
@Mock
private static HttpResponse<List<ApolloConfigNotification>> pollResponse;
private RemoteConfigLongPollService remoteConfigLongPollService;
@Mock
private PropertiesFactory propertiesFactory;
private static String someAppId;
private static String someCluster;
private static String someSecret;
@Before
public void setUp() throws Exception {
someNamespace = "someName";
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_NOT_MODIFIED);
configUtil = new MockConfigUtil();
MockInjector.setInstance(ConfigUtil.class, configUtil);
someServerUrl = "http://someServer";
ServiceDTO serviceDTO = mock(ServiceDTO.class);
when(serviceDTO.getHomepageUrl()).thenReturn(someServerUrl);
when(configServiceLocator.getConfigServices()).thenReturn(Lists.newArrayList(serviceDTO));
MockInjector.setInstance(ConfigServiceLocator.class, configServiceLocator);
httpClient = spy(new MockHttpClient());
MockInjector.setInstance(HttpClient.class, httpClient);
remoteConfigLongPollService = new RemoteConfigLongPollService();
MockInjector.setInstance(RemoteConfigLongPollService.class, remoteConfigLongPollService);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new Properties();
}
});
MockInjector.setInstance(PropertiesFactory.class, propertiesFactory);
someAppId = "someAppId";
someCluster = "someCluster";
}
@After
public void tearDown() throws Exception {
MockInjector.reset();
}
@Test
public void testLoadConfig() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLoadConfigWithOrderedProperties() throws Exception {
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newLinkedHashMap();
configurations.put(someKey, someValue);
configurations.put("someKey2", "someValue2");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
when(propertiesFactory.getPropertiesInstance()).thenAnswer(new Answer<Properties>() {
@Override
public Properties answer(InvocationOnMock invocation) {
return new OrderedProperties();
}
});
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertTrue(config instanceof OrderedProperties);
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
String[] actualArrays = config.keySet().toArray(new String[]{});
String[] expectedArrays = {"someKey", "someKey2"};
assertArrayEquals(expectedArrays, actualArrays);
}
@Test
public void testLoadConfigWithAccessKeySecret() throws Exception {
someSecret = "someSecret";
String someKey = "someKey";
String someValue = "someValue";
Map<String, String> configurations = Maps.newHashMap();
configurations.put(someKey, someValue);
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
doAnswer(new Answer<HttpResponse<ApolloConfig>>() {
@Override
public HttpResponse<ApolloConfig> answer(InvocationOnMock invocation) throws Throwable {
HttpRequest request = invocation.getArgumentAt(0, HttpRequest.class);
Map<String, String> headers = request.getHeaders();
assertNotNull(headers);
assertTrue(headers.containsKey(Signature.HTTP_HEADER_TIMESTAMP));
assertTrue(headers.containsKey(HttpHeaders.AUTHORIZATION));
return someResponse;
}
}).when(httpClient).doGet(any(HttpRequest.class), any(Class.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
Properties config = remoteConfigRepository.getConfig();
assertEquals(configurations, config);
assertEquals(ConfigSourceType.REMOTE, remoteConfigRepository.getSourceType());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithServerError() throws Exception {
when(someResponse.getStatusCode()).thenReturn(500);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test(expected = ApolloConfigException.class)
public void testGetRemoteConfigWithNotFount() throws Exception {
when(someResponse.getStatusCode()).thenReturn(404);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
//must stop the long polling before exception occurred
remoteConfigLongPollService.stopLongPollingRefresh();
remoteConfigRepository.getConfig();
}
@Test
public void testRepositoryChangeListener() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
when(someResponse.getBody()).thenReturn(newApolloConfig);
remoteConfigRepository.sync();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
remoteConfigLongPollService.stopLongPollingRefresh();
}
@Test
public void testLongPollingRefresh() throws Exception {
Map<String, String> configurations = ImmutableMap.of("someKey", "someValue");
ApolloConfig someApolloConfig = assembleApolloConfig(configurations);
when(someResponse.getStatusCode()).thenReturn(200);
when(someResponse.getBody()).thenReturn(someApolloConfig);
final SettableFuture<Boolean> longPollFinished = SettableFuture.create();
RepositoryChangeListener someListener = mock(RepositoryChangeListener.class);
doAnswer(new Answer<Void>() {
@Override
public Void answer(InvocationOnMock invocation) throws Throwable {
longPollFinished.set(true);
return null;
}
}).when(someListener).onRepositoryChange(any(String.class), any(Properties.class));
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
remoteConfigRepository.addChangeListener(someListener);
final ArgumentCaptor<Properties> captor = ArgumentCaptor.forClass(Properties.class);
Map<String, String> newConfigurations = ImmutableMap.of("someKey", "anotherValue");
ApolloConfig newApolloConfig = assembleApolloConfig(newConfigurations);
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
notificationMessages.put(someKey, someNotificationId);
ApolloConfigNotification someNotification = mock(ApolloConfigNotification.class);
when(someNotification.getNamespaceName()).thenReturn(someNamespace);
when(someNotification.getMessages()).thenReturn(notificationMessages);
when(pollResponse.getStatusCode()).thenReturn(HttpServletResponse.SC_OK);
when(pollResponse.getBody()).thenReturn(Lists.newArrayList(someNotification));
when(someResponse.getBody()).thenReturn(newApolloConfig);
longPollFinished.get(30_000, TimeUnit.MILLISECONDS);
remoteConfigLongPollService.stopLongPollingRefresh();
verify(someListener, times(1)).onRepositoryChange(eq(someNamespace), captor.capture());
assertEquals(newConfigurations, captor.getValue());
final ArgumentCaptor<HttpRequest> httpRequestArgumentCaptor = ArgumentCaptor
.forClass(HttpRequest.class);
verify(httpClient, atLeast(2)).doGet(httpRequestArgumentCaptor.capture(), eq(ApolloConfig.class));
HttpRequest request = httpRequestArgumentCaptor.getValue();
assertTrue(request.getUrl().contains("messages=%7B%22details%22%3A%7B%22someKey%22%3A1%7D%7D"));
}
@Test
public void testAssembleQueryConfigUrl() throws Exception {
Gson gson = new Gson();
String someUri = "http://someServer";
String someAppId = "someAppId";
String someCluster = "someCluster+ &.-_someSign";
String someReleaseKey = "20160705193346-583078ef5716c055+20160705193308-31c471ddf9087c3f";
ApolloNotificationMessages notificationMessages = new ApolloNotificationMessages();
String someKey = "someKey";
long someNotificationId = 1;
String anotherKey = "anotherKey";
long anotherNotificationId = 2;
notificationMessages.put(someKey, someNotificationId);
notificationMessages.put(anotherKey, anotherNotificationId);
RemoteConfigRepository remoteConfigRepository = new RemoteConfigRepository(someNamespace);
ApolloConfig someApolloConfig = mock(ApolloConfig.class);
when(someApolloConfig.getReleaseKey()).thenReturn(someReleaseKey);
String queryConfigUrl = remoteConfigRepository
.assembleQueryConfigUrl(someUri, someAppId, someCluster, someNamespace, null,
notificationMessages,
someApolloConfig);
remoteConfigLongPollService.stopLongPollingRefresh();
assertTrue(queryConfigUrl
.contains(
"http://someServer/configs/someAppId/someCluster+%20&.-_someSign/" + someNamespace));
assertTrue(queryConfigUrl
.contains("releaseKey=20160705193346-583078ef5716c055%2B20160705193308-31c471ddf9087c3f"));
assertTrue(queryConfigUrl
.contains("messages=" + UrlEscapers.urlFormParameterEscaper()
.escape(gson.toJson(notificationMessages))));
}
private ApolloConfig assembleApolloConfig(Map<String, String> configurations) {
String someAppId = "appId";
String someClusterName = "cluster";
String someReleaseKey = "1";
ApolloConfig apolloConfig =
new ApolloConfig(someAppId, someClusterName, someNamespace, someReleaseKey);
apolloConfig.setConfigurations(configurations);
return apolloConfig;
}
public static class MockConfigUtil extends ConfigUtil {
@Override
public String getAppId() {
return someAppId;
}
@Override
public String getCluster() {
return someCluster;
}
@Override
public String getAccessKeySecret() {
return someSecret;
}
@Override
public String getDataCenter() {
return null;
}
@Override
public int getLoadConfigQPS() {
return 200;
}
@Override
public int getLongPollQPS() {
return 200;
}
@Override
public long getOnErrorRetryInterval() {
return 10;
}
@Override
public TimeUnit getOnErrorRetryIntervalTimeUnit() {
return TimeUnit.MILLISECONDS;
}
@Override
public long getLongPollingInitialDelayInMills() {
return 0;
}
}
public static class MockHttpClient implements HttpClient {
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Class<T> responseType) {
if (someResponse.getStatusCode() == 200 || someResponse.getStatusCode() == 304) {
return (HttpResponse<T>) someResponse;
}
throw new ApolloConfigStatusCodeException(someResponse.getStatusCode(),
String.format("Http request failed due to status code: %d",
someResponse.getStatusCode()));
}
@Override
public <T> HttpResponse<T> doGet(HttpRequest httpRequest, Type responseType) {
try {
TimeUnit.MILLISECONDS.sleep(50);
} catch (InterruptedException e) {
}
return (HttpResponse<T>) pollResponse;
}
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/internals/DefaultMetaServerProvider.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import com.ctrip.framework.foundation.Foundation;
import com.google.common.base.Strings;
import org.slf4j.Logger;
public class DefaultMetaServerProvider implements MetaServerProvider {
public static final int ORDER = 0;
private static final Logger logger = DeferredLoggerFactory
.getLogger(DefaultMetaServerProvider.class);
private final String metaServerAddress;
public DefaultMetaServerProvider() {
metaServerAddress = initMetaServerAddress();
}
private String initMetaServerAddress() {
// 1. Get from System Property
String metaAddress = System.getProperty(ConfigConsts.APOLLO_META_KEY);
if (Strings.isNullOrEmpty(metaAddress)) {
// 2. Get from OS environment variable, which could not contain dot and is normally in UPPER case
metaAddress = System.getenv(ApolloClientSystemConsts.APOLLO_META_ENVIRONMENT_VARIABLES);
}
if (Strings.isNullOrEmpty(metaAddress)) {
// 3. Get from server.properties
metaAddress = Foundation.server().getProperty(ConfigConsts.APOLLO_META_KEY, null);
}
if (Strings.isNullOrEmpty(metaAddress)) {
// 4. Get from app.properties
metaAddress = Foundation.app().getProperty(ConfigConsts.APOLLO_META_KEY, null);
}
if (Strings.isNullOrEmpty(metaAddress)) {
logger.warn(
"Could not find meta server address, because it is not available in neither (1) JVM system property 'apollo.meta', (2) OS env variable 'APOLLO_META' (3) property 'apollo.meta' from server.properties nor (4) property 'apollo.meta' from app.properties");
} else {
metaAddress = metaAddress.trim();
logger.info("Located meta services from apollo.meta configuration: {}!", metaAddress);
}
return metaAddress;
}
@Override
public String getMetaServerAddress(Env targetEnv) {
//for default meta server provider, we don't care the actual environment
return metaServerAddress;
}
@Override
public int getOrder() {
return ORDER;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.internals;
import com.ctrip.framework.apollo.core.ApolloClientSystemConsts;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.ctrip.framework.apollo.core.enums.Env;
import com.ctrip.framework.apollo.core.spi.MetaServerProvider;
import com.ctrip.framework.apollo.core.utils.DeferredLoggerFactory;
import com.ctrip.framework.foundation.Foundation;
import com.google.common.base.Strings;
import org.slf4j.Logger;
public class DefaultMetaServerProvider implements MetaServerProvider {
public static final int ORDER = 0;
private static final Logger logger = DeferredLoggerFactory
.getLogger(DefaultMetaServerProvider.class);
private final String metaServerAddress;
public DefaultMetaServerProvider() {
metaServerAddress = initMetaServerAddress();
}
private String initMetaServerAddress() {
// 1. Get from System Property
String metaAddress = System.getProperty(ConfigConsts.APOLLO_META_KEY);
if (Strings.isNullOrEmpty(metaAddress)) {
// 2. Get from OS environment variable, which could not contain dot and is normally in UPPER case
metaAddress = System.getenv(ApolloClientSystemConsts.APOLLO_META_ENVIRONMENT_VARIABLES);
}
if (Strings.isNullOrEmpty(metaAddress)) {
// 3. Get from server.properties
metaAddress = Foundation.server().getProperty(ConfigConsts.APOLLO_META_KEY, null);
}
if (Strings.isNullOrEmpty(metaAddress)) {
// 4. Get from app.properties
metaAddress = Foundation.app().getProperty(ConfigConsts.APOLLO_META_KEY, null);
}
if (Strings.isNullOrEmpty(metaAddress)) {
logger.warn(
"Could not find meta server address, because it is not available in neither (1) JVM system property 'apollo.meta', (2) OS env variable 'APOLLO_META' (3) property 'apollo.meta' from server.properties nor (4) property 'apollo.meta' from app.properties");
} else {
metaAddress = metaAddress.trim();
logger.info("Located meta services from apollo.meta configuration: {}!", metaAddress);
}
return metaAddress;
}
@Override
public String getMetaServerAddress(Env targetEnv) {
//for default meta server provider, we don't care the actual environment
return metaServerAddress;
}
@Override
public int getOrder() {
return ORDER;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/constants/ReleaseOperation.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.constants;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ReleaseOperation {
int NORMAL_RELEASE = 0;
int ROLLBACK = 1;
int GRAY_RELEASE = 2;
int APPLY_GRAY_RULES = 3;
int GRAY_RELEASE_MERGE_TO_MASTER = 4;
int MASTER_NORMAL_RELEASE_MERGE_TO_GRAY = 5;
int MATER_ROLLBACK_MERGE_TO_GRAY = 6;
int ABANDON_GRAY_RELEASE = 7;
int GRAY_RELEASE_DELETED_AFTER_MERGE = 8;
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.constants;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface ReleaseOperation {
int NORMAL_RELEASE = 0;
int ROLLBACK = 1;
int GRAY_RELEASE = 2;
int APPLY_GRAY_RULES = 3;
int GRAY_RELEASE_MERGE_TO_MASTER = 4;
int MASTER_NORMAL_RELEASE_MERGE_TO_GRAY = 5;
int MATER_ROLLBACK_MERGE_TO_GRAY = 6;
int ABANDON_GRAY_RELEASE = 7;
int GRAY_RELEASE_DELETED_AFTER_MERGE = 8;
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/controller/ClusterController.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.service.ClusterService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@RestController
public class ClusterController {
private final ClusterService clusterService;
private final UserInfoHolder userInfoHolder;
public ClusterController(final ClusterService clusterService, final UserInfoHolder userInfoHolder) {
this.clusterService = clusterService;
this.userInfoHolder = userInfoHolder;
}
@PreAuthorize(value = "@permissionValidator.hasCreateClusterPermission(#appId)")
@PostMapping(value = "apps/{appId}/envs/{env}/clusters")
public ClusterDTO createCluster(@PathVariable String appId, @PathVariable String env,
@Valid @RequestBody ClusterDTO cluster) {
String operator = userInfoHolder.getUser().getUserId();
cluster.setDataChangeLastModifiedBy(operator);
cluster.setDataChangeCreatedBy(operator);
return clusterService.createCluster(Env.valueOf(env), cluster);
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@DeleteMapping(value = "apps/{appId}/envs/{env}/clusters/{clusterName:.+}")
public ResponseEntity<Void> deleteCluster(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName){
clusterService.deleteCluster(Env.valueOf(env), appId, clusterName);
return ResponseEntity.ok().build();
}
@GetMapping(value = "apps/{appId}/envs/{env}/clusters/{clusterName:.+}")
public ClusterDTO loadCluster(@PathVariable("appId") String appId, @PathVariable String env, @PathVariable("clusterName") String clusterName) {
return clusterService.loadCluster(appId, Env.valueOf(env), clusterName);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.controller;
import com.ctrip.framework.apollo.common.dto.ClusterDTO;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.service.ClusterService;
import com.ctrip.framework.apollo.portal.spi.UserInfoHolder;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import javax.validation.Valid;
@RestController
public class ClusterController {
private final ClusterService clusterService;
private final UserInfoHolder userInfoHolder;
public ClusterController(final ClusterService clusterService, final UserInfoHolder userInfoHolder) {
this.clusterService = clusterService;
this.userInfoHolder = userInfoHolder;
}
@PreAuthorize(value = "@permissionValidator.hasCreateClusterPermission(#appId)")
@PostMapping(value = "apps/{appId}/envs/{env}/clusters")
public ClusterDTO createCluster(@PathVariable String appId, @PathVariable String env,
@Valid @RequestBody ClusterDTO cluster) {
String operator = userInfoHolder.getUser().getUserId();
cluster.setDataChangeLastModifiedBy(operator);
cluster.setDataChangeCreatedBy(operator);
return clusterService.createCluster(Env.valueOf(env), cluster);
}
@PreAuthorize(value = "@permissionValidator.isSuperAdmin()")
@DeleteMapping(value = "apps/{appId}/envs/{env}/clusters/{clusterName:.+}")
public ResponseEntity<Void> deleteCluster(@PathVariable String appId, @PathVariable String env,
@PathVariable String clusterName){
clusterService.deleteCluster(Env.valueOf(env), appId, clusterName);
return ResponseEntity.ok().build();
}
@GetMapping(value = "apps/{appId}/envs/{env}/clusters/{clusterName:.+}")
public ClusterDTO loadCluster(@PathVariable("appId") String appId, @PathVariable String env, @PathVariable("clusterName") String clusterName) {
return clusterService.loadCluster(appId, Env.valueOf(env), clusterName);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-adminservice/src/test/java/com/ctrip/framework/apollo/adminservice/controller/AbstractControllerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = AdminServiceTestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public abstract class AbstractControllerTest {
@Autowired
private HttpMessageConverters httpMessageConverters;
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
@PostConstruct
private void postConstruct() {
restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
restTemplate.setMessageConverters(httpMessageConverters.getConverters());
}
@Value("${local.server.port}")
protected int port;
protected String url(String path) {
return "http://localhost:" + port + path;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.adminservice.controller;
import com.ctrip.framework.apollo.AdminServiceTestConfiguration;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.RestTemplate;
import javax.annotation.PostConstruct;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootTest(classes = AdminServiceTestConfiguration.class, webEnvironment = WebEnvironment.RANDOM_PORT)
public abstract class AbstractControllerTest {
@Autowired
private HttpMessageConverters httpMessageConverters;
protected RestTemplate restTemplate = (new TestRestTemplate()).getRestTemplate();
@PostConstruct
private void postConstruct() {
restTemplate.setErrorHandler(new DefaultResponseErrorHandler());
restTemplate.setMessageConverters(httpMessageConverters.getConverters());
}
@Value("${local.server.port}")
protected int port;
protected String url(String path) {
return "http://localhost:" + port + path;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/test/java/com/ctrip/framework/apollo/biz/BizTestConfiguration.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableAutoConfiguration
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class, ApolloBizConfig.class})
public class BizTestConfiguration {
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz;
import com.ctrip.framework.apollo.common.ApolloCommonConfig;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@Configuration
@EnableAutoConfiguration
@ComponentScan(basePackageClasses = {ApolloCommonConfig.class, ApolloBizConfig.class})
public class BizTestConfiguration {
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client-config-data/src/main/java/com/ctrip/framework/apollo/config/data/importer/ApolloConfigDataResource.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.core.ConfigConsts;
import java.util.Objects;
import org.springframework.boot.context.config.ConfigDataResource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigDataResource extends ConfigDataResource {
/**
* default resource instance
*/
public static final ApolloConfigDataResource DEFAULT = new ApolloConfigDataResource(
ConfigConsts.NAMESPACE_APPLICATION);
/**
* apollo config namespace
*/
private final String namespace;
public ApolloConfigDataResource(String namespace) {
this.namespace = namespace;
}
public String getNamespace() {
return namespace;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ApolloConfigDataResource that = (ApolloConfigDataResource) o;
return Objects.equals(namespace, that.namespace);
}
@Override
public int hashCode() {
return Objects.hash(namespace);
}
@Override
public String toString() {
return "ApolloConfigDataResource{" +
"namespace='" + namespace + '\'' +
'}';
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.config.data.importer;
import com.ctrip.framework.apollo.core.ConfigConsts;
import java.util.Objects;
import org.springframework.boot.context.config.ConfigDataResource;
/**
* @author vdisk <vdisk@foxmail.com>
*/
public class ApolloConfigDataResource extends ConfigDataResource {
/**
* default resource instance
*/
public static final ApolloConfigDataResource DEFAULT = new ApolloConfigDataResource(
ConfigConsts.NAMESPACE_APPLICATION);
/**
* apollo config namespace
*/
private final String namespace;
public ApolloConfigDataResource(String namespace) {
this.namespace = namespace;
}
public String getNamespace() {
return namespace;
}
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (o == null || getClass() != o.getClass()) {
return false;
}
ApolloConfigDataResource that = (ApolloConfigDataResource) o;
return Objects.equals(namespace, that.namespace);
}
@Override
public int hashCode() {
return Objects.hash(namespace);
}
@Override
public String toString() {
return "ApolloConfigDataResource{" +
"namespace='" + namespace + '\'' +
'}';
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/dto/GrayReleaseRuleDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.google.common.collect.Sets;
import java.util.Set;
public class GrayReleaseRuleDTO extends BaseDTO {
private String appId;
private String clusterName;
private String namespaceName;
private String branchName;
private Set<GrayReleaseRuleItemDTO> ruleItems;
private Long releaseId;
public GrayReleaseRuleDTO(String appId, String clusterName, String namespaceName, String branchName) {
this.appId = appId;
this.clusterName = clusterName;
this.namespaceName = namespaceName;
this.branchName = branchName;
this.ruleItems = Sets.newHashSet();
}
public String getAppId() {
return appId;
}
public String getClusterName() {
return clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public String getBranchName() {
return branchName;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public void setRuleItems(Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleItems = ruleItems;
}
public void addRuleItem(GrayReleaseRuleItemDTO ruleItem) {
this.ruleItems.add(ruleItem);
}
public Long getReleaseId() {
return releaseId;
}
public void setReleaseId(Long releaseId) {
this.releaseId = releaseId;
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.common.dto;
import com.google.common.collect.Sets;
import java.util.Set;
public class GrayReleaseRuleDTO extends BaseDTO {
private String appId;
private String clusterName;
private String namespaceName;
private String branchName;
private Set<GrayReleaseRuleItemDTO> ruleItems;
private Long releaseId;
public GrayReleaseRuleDTO(String appId, String clusterName, String namespaceName, String branchName) {
this.appId = appId;
this.clusterName = clusterName;
this.namespaceName = namespaceName;
this.branchName = branchName;
this.ruleItems = Sets.newHashSet();
}
public String getAppId() {
return appId;
}
public String getClusterName() {
return clusterName;
}
public String getNamespaceName() {
return namespaceName;
}
public String getBranchName() {
return branchName;
}
public Set<GrayReleaseRuleItemDTO> getRuleItems() {
return ruleItems;
}
public void setRuleItems(Set<GrayReleaseRuleItemDTO> ruleItems) {
this.ruleItems = ruleItems;
}
public void addRuleItem(GrayReleaseRuleItemDTO ruleItem) {
this.ruleItems.add(ruleItem);
}
public Long getReleaseId() {
return releaseId;
}
public void setReleaseId(Long releaseId) {
this.releaseId = releaseId;
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/sql/delta/v060-v062/apolloportaldb-v060-v062.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
# delta schema to upgrade apollo portal db from v0.6.0 to v0.6.2
Use ApolloPortalDB;
ALTER TABLE `App` DROP INDEX `NAME`;
CREATE INDEX `IX_NAME` ON App (`Name`(191));
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
# delta schema to upgrade apollo portal db from v0.6.0 to v0.6.2
Use ApolloPortalDB;
ALTER TABLE `App` DROP INDEX `NAME`;
CREATE INDEX `IX_NAME` ON App (`Name`(191));
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-openapi/src/test/java/com/ctrip/framework/apollo/openapi/client/service/AbstractOpenApiServiceTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.client.constant.ApolloOpenApiConstants;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.http.StatusLine;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
abstract class AbstractOpenApiServiceTest {
@Mock
protected CloseableHttpClient httpClient;
@Mock
protected CloseableHttpResponse someHttpResponse;
@Mock
protected StatusLine statusLine;
protected Gson gson;
protected String someBaseUrl;
@Before
public void setUp() throws Exception {
gson = new GsonBuilder().setDateFormat(ApolloOpenApiConstants.JSON_DATE_FORMAT).create();
someBaseUrl = "http://someBaseUrl";
when(someHttpResponse.getStatusLine()).thenReturn(statusLine);
when(statusLine.getStatusCode()).thenReturn(200);
when(httpClient.execute(any(HttpUriRequest.class))).thenReturn(someHttpResponse);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.client.service;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when;
import com.ctrip.framework.apollo.openapi.client.constant.ApolloOpenApiConstants;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.http.StatusLine;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.impl.client.CloseableHttpClient;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
abstract class AbstractOpenApiServiceTest {
@Mock
protected CloseableHttpClient httpClient;
@Mock
protected CloseableHttpResponse someHttpResponse;
@Mock
protected StatusLine statusLine;
protected Gson gson;
protected String someBaseUrl;
@Before
public void setUp() throws Exception {
gson = new GsonBuilder().setDateFormat(ApolloOpenApiConstants.JSON_DATE_FORMAT).create();
someBaseUrl = "http://someBaseUrl";
when(someHttpResponse.getStatusLine()).thenReturn(statusLine);
when(statusLine.getStatusCode()).thenReturn(200);
when(httpClient.execute(any(HttpUriRequest.class))).thenReturn(someHttpResponse);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./scripts/helm/apollo-portal/templates/service-portal.yaml | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.portal.serviceName" . }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.service.port }}
targetPort: {{ .Values.service.targetPort }}
selector:
app: {{ include "apollo.portal.fullName" . }}
sessionAffinity: {{ .Values.service.sessionAffinity }} | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
kind: Service
apiVersion: v1
metadata:
name: {{ include "apollo.portal.serviceName" . }}
labels:
{{- include "apollo.portal.labels" . | nindent 4 }}
spec:
type: {{ .Values.service.type }}
ports:
- name: http
protocol: TCP
port: {{ .Values.service.port }}
targetPort: {{ .Values.service.targetPort }}
selector:
app: {{ include "apollo.portal.fullName" . }}
sessionAffinity: {{ .Values.service.sessionAffinity }} | -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/main/java/com/ctrip/framework/apollo/spring/annotation/ApolloConfigRegistrar.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import com.ctrip.framework.apollo.spring.spi.ApolloConfigRegistrarHelper;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.EnvironmentAware;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloConfigRegistrar implements ImportBeanDefinitionRegistrar, EnvironmentAware {
private final ApolloConfigRegistrarHelper helper = ServiceBootstrap.loadPrimary(ApolloConfigRegistrarHelper.class);
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
helper.registerBeanDefinitions(importingClassMetadata, registry);
}
@Override
public void setEnvironment(Environment environment) {
this.helper.setEnvironment(environment);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.spring.annotation;
import com.ctrip.framework.apollo.spring.spi.ApolloConfigRegistrarHelper;
import com.ctrip.framework.foundation.internals.ServiceBootstrap;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.context.EnvironmentAware;
import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
import org.springframework.core.env.Environment;
import org.springframework.core.type.AnnotationMetadata;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ApolloConfigRegistrar implements ImportBeanDefinitionRegistrar, EnvironmentAware {
private final ApolloConfigRegistrarHelper helper = ServiceBootstrap.loadPrimary(ApolloConfigRegistrarHelper.class);
@Override
public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
helper.registerBeanDefinitions(importingClassMetadata, registry);
}
@Override
public void setEnvironment(Environment environment) {
this.helper.setEnvironment(environment);
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/resources/application-consul-discovery.properties | #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apollo.eureka.server.enabled=false
eureka.client.enabled=false
#consul enabled
spring.cloud.consul.enabled=true
spring.cloud.consul.discovery.enabled=true
spring.cloud.consul.service-registry.enabled=true
spring.cloud.consul.discovery.heartbeat.enabled=true
spring.cloud.consul.discovery.instance-id=apollo-configservice
| #
# Copyright 2021 Apollo Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
apollo.eureka.server.enabled=false
eureka.client.enabled=false
#consul enabled
spring.cloud.consul.enabled=true
spring.cloud.consul.discovery.enabled=true
spring.cloud.consul.service-registry.enabled=true
spring.cloud.consul.discovery.heartbeat.enabled=true
spring.cloud.consul.discovery.instance-id=apollo-configservice
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/test/resources/data.sql | --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','liuym@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','song_s@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','apollo-portal','张乐','zhanglea@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('fxhermesproducer','fx-hermes-producer','梁锦华','jhliang@ctrip.com');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'cluster1');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'cluster2');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'cluster3');
INSERT INTO Cluster (AppId, Name) VALUES ('fxhermesproducer', 'default');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'fx.apollo.config');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'fx.apollo.admin');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'fx.apollo.portal');
INSERT INTO AppNamespace (AppID, Name) VALUES ('fxhermesproducer', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (1, '100003171', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (2, 'fxhermesproducer', 'default', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003172', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (5, '100003171', 'default', 'application');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k1', 'v1', 'comment1');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k2', 'v2', 'comment2');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (2, 'k3', 'v3', 'comment3');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (5, 'k3', 'v4', 'comment4');
INSERT INTO RELEASE (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}');
| --
-- Copyright 2021 Apollo Authors
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003171','apollo-config-service','刘一鸣','liuym@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003172','apollo-admin-service','宋顺','song_s@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('100003173','apollo-portal','张乐','zhanglea@ctrip.com');
INSERT INTO App (AppId, Name, OwnerName, OwnerEmail) VALUES ('fxhermesproducer','fx-hermes-producer','梁锦华','jhliang@ctrip.com');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003171', 'cluster1');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003172', 'cluster2');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'default');
INSERT INTO Cluster (AppId, Name) VALUES ('100003173', 'cluster3');
INSERT INTO Cluster (AppId, Name) VALUES ('fxhermesproducer', 'default');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003171', 'fx.apollo.config');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003172', 'fx.apollo.admin');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'application');
INSERT INTO AppNamespace (AppId, Name) VALUES ('100003173', 'fx.apollo.portal');
INSERT INTO AppNamespace (AppID, Name) VALUES ('fxhermesproducer', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (1, '100003171', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (2, 'fxhermesproducer', 'default', 'fx.hermes.producer');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (3, '100003172', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (4, '100003173', 'default', 'application');
INSERT INTO Namespace (Id, AppId, ClusterName, NamespaceName) VALUES (5, '100003171', 'default', 'application');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k1', 'v1', 'comment1');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (1, 'k2', 'v2', 'comment2');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (2, 'k3', 'v3', 'comment3');
INSERT INTO Item (NamespaceId, `Key`, Value, Comment) VALUES (5, 'k3', 'v4', 'comment4');
INSERT INTO RELEASE (ReleaseKey, Name, Comment, AppId, ClusterName, NamespaceName, Configurations) VALUES ('TEST-RELEASE-KEY', 'REV1','First Release','100003171', 'default', 'application', '{"k1":"v1"}');
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/java/com/ctrip/framework/apollo/portal/spi/defaultimpl/DefaultMQService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.defaultimpl;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.spi.MQService;
public class DefaultMQService implements MQService{
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
//do nothing
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.portal.spi.defaultimpl;
import com.ctrip.framework.apollo.portal.environment.Env;
import com.ctrip.framework.apollo.portal.entity.bo.ReleaseHistoryBO;
import com.ctrip.framework.apollo.portal.spi.MQService;
public class DefaultMQService implements MQService{
@Override
public void sendPublishMsg(Env env, ReleaseHistoryBO releaseHistory) {
//do nothing
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-client/src/test/resources/spring/XmlConfigAnnotationTest6.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigChangeListenerWithInterestedKeysBean"/>
</beans>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:apollo="http://www.ctrip.com/schema/apollo"
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.ctrip.com/schema/apollo http://www.ctrip.com/schema/apollo.xsd">
<apollo:config/>
<bean class="com.ctrip.framework.apollo.spring.XMLConfigAnnotationTest.TestApolloConfigChangeListenerWithInterestedKeysBean"/>
</beans>
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/pom.xml | <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-configservice</artifactId>
<name>Apollo ConfigService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<!-- end of apollo -->
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>ribbon-eureka</artifactId>
<groupId>com.netflix.ribbon</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-ec2</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-autoscaling</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-sts</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId>
<version>${nacos-discovery-api.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>nacos-discovery</id>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| <?xml version="1.0" encoding="UTF-8"?>
<!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId>
<version>${revision}</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apollo-configservice</artifactId>
<name>Apollo ConfigService</name>
<properties>
<github.path>${project.artifactId}</github.path>
</properties>
<dependencies>
<!-- apollo -->
<dependency>
<groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-biz</artifactId>
</dependency>
<!-- end of apollo -->
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
<exclusions>
<exclusion>
<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
<exclusion>
<artifactId>ribbon-eureka</artifactId>
<groupId>com.netflix.ribbon</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-core</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-ec2</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-autoscaling</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-sts</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<exclusion>
<artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-apache-client4</artifactId>
</dependency>
<!-- end of eureka -->
<dependency>
<groupId>com.alibaba.nacos</groupId>
<artifactId>nacos-api</artifactId>
<version>${nacos-discovery-api.version}</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<!-- JDK 1.8+ -->
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
<dependency>
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
</dependency>
<!-- end of JDK 1.8+ -->
<!-- JDK 11+ -->
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
</dependency>
<!-- end of JDK 11+ -->
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<finalName>${project.artifactId}-${project.version}-${package.environment}</finalName>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/assembly/assembly-descriptor.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>1.2.2</version>
<configuration>
<imageName>apolloconfig/${project.artifactId}</imageName>
<imageTags>
<imageTag>${project.version}</imageTag>
<imageTag>latest</imageTag>
</imageTags>
<dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
<serverId>docker-hub</serverId>
<buildArgs>
<VERSION>${project.version}</VERSION>
</buildArgs>
<resources>
<resource>
<targetPath>/</targetPath>
<directory>${project.build.directory}</directory>
<include>*.zip</include>
</resource>
</resources>
</configuration>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>nacos-discovery</id>
<dependencies>
<dependency>
<groupId>com.alibaba.boot</groupId>
<artifactId>nacos-discovery-spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/test/java/com/ctrip/framework/apollo/core/utils/DeferredLoggerTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.test.tools.AloneRunner;
import com.ctrip.framework.test.tools.AloneWith;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/11
*/
@RunWith(AloneRunner.class)
@AloneWith(JUnit4.class)
public class DeferredLoggerTest {
private static ByteArrayOutputStream outContent;
private static Logger logger = null;
private static PrintStream printStream;
@BeforeClass
public static void init() throws NoSuchFieldException, IllegalAccessException {
DeferredLoggerTest.outContent = new ByteArrayOutputStream();
DeferredLoggerTest.printStream = new PrintStream(DeferredLoggerTest.outContent);
System.setOut(DeferredLoggerTest.printStream);
DeferredLoggerTest.logger = DeferredLoggerFactory.getLogger("DeferredLoggerTest");
}
@Test
public void testErrorLog() {
DeferredLoggerTest.logger.error("errorLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger"));
}
@Test
public void testInfoLog() {
DeferredLoggerTest.logger.info("inFoLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger"));
}
@Test
public void testWarnLog() {
DeferredLoggerTest.logger.warn("warnLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger"));
}
@Test
public void testDebugLog() {
DeferredLoggerTest.logger.warn("debugLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger"));
}
@Test
public void testDeferredLog() {
DeferredLogger.enable();
DeferredLoggerTest.logger.error("errorLogger_testDeferredLog");
DeferredLoggerTest.logger.info("inFoLogger_testDeferredLog");
DeferredLoggerTest.logger.warn("warnLogger_testDeferredLog");
DeferredLoggerTest.logger.debug("debugLogger_testDeferredLog");
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
DeferredLogCache.replayTo();
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.utils;
import com.ctrip.framework.test.tools.AloneRunner;
import com.ctrip.framework.test.tools.AloneWith;
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
import org.slf4j.Logger;
/**
* @author kl (http://kailing.pub)
* @since 2021/5/11
*/
@RunWith(AloneRunner.class)
@AloneWith(JUnit4.class)
public class DeferredLoggerTest {
private static ByteArrayOutputStream outContent;
private static Logger logger = null;
private static PrintStream printStream;
@BeforeClass
public static void init() throws NoSuchFieldException, IllegalAccessException {
DeferredLoggerTest.outContent = new ByteArrayOutputStream();
DeferredLoggerTest.printStream = new PrintStream(DeferredLoggerTest.outContent);
System.setOut(DeferredLoggerTest.printStream);
DeferredLoggerTest.logger = DeferredLoggerFactory.getLogger("DeferredLoggerTest");
}
@Test
public void testErrorLog() {
DeferredLoggerTest.logger.error("errorLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger"));
}
@Test
public void testInfoLog() {
DeferredLoggerTest.logger.info("inFoLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger"));
}
@Test
public void testWarnLog() {
DeferredLoggerTest.logger.warn("warnLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger"));
}
@Test
public void testDebugLog() {
DeferredLoggerTest.logger.warn("debugLogger");
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger"));
}
@Test
public void testDeferredLog() {
DeferredLogger.enable();
DeferredLoggerTest.logger.error("errorLogger_testDeferredLog");
DeferredLoggerTest.logger.info("inFoLogger_testDeferredLog");
DeferredLoggerTest.logger.warn("warnLogger_testDeferredLog");
DeferredLoggerTest.logger.debug("debugLogger_testDeferredLog");
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertFalse(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
DeferredLogCache.replayTo();
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("errorLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("inFoLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("warnLogger_testDeferredLog"));
Assert.assertTrue(DeferredLoggerTest.outContent.toString().contains("debugLogger_testDeferredLog"));
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-openapi/src/main/java/com/ctrip/framework/apollo/openapi/dto/OpenEnvClusterDTO.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenEnvClusterDTO {
private String env;
private Set<String> clusters;
public String getEnv() {
return env;
}
public void setEnv(String env) {
this.env = env;
}
public Set<String> getClusters() {
return clusters;
}
public void setClusters(Set<String> clusters) {
this.clusters = clusters;
}
@Override
public String toString() {
return "OpenEnvClusterDTO{" +
"env='" + env + '\'' +
", clusters=" + clusters +
'}';
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.openapi.dto;
import java.util.Set;
public class OpenEnvClusterDTO {
private String env;
private Set<String> clusters;
public String getEnv() {
return env;
}
public void setEnv(String env) {
this.env = env;
}
public Set<String> getClusters() {
return clusters;
}
public void setClusters(Set<String> clusters) {
this.clusters = clusters;
}
@Override
public String toString() {
return "OpenEnvClusterDTO{" +
"env='" + env + '\'' +
", clusters=" + clusters +
'}';
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/service/ItemService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
public class ItemService {
private final ItemRepository itemRepository;
private final NamespaceService namespaceService;
private final AuditService auditService;
private final BizConfig bizConfig;
public ItemService(
final ItemRepository itemRepository,
final @Lazy NamespaceService namespaceService,
final AuditService auditService,
final BizConfig bizConfig) {
this.itemRepository = itemRepository;
this.namespaceService = namespaceService;
this.auditService = auditService;
this.bizConfig = bizConfig;
}
@Transactional
public Item delete(long id, String operator) {
Item item = itemRepository.findById(id).orElse(null);
if (item == null) {
throw new IllegalArgumentException("item not exist. ID:" + id);
}
item.setDeleted(true);
item.setDataChangeLastModifiedBy(operator);
Item deletedItem = itemRepository.save(item);
auditService.audit(Item.class.getSimpleName(), id, Audit.OP.DELETE, operator);
return deletedItem;
}
@Transactional
public int batchDelete(long namespaceId, String operator) {
return itemRepository.deleteByNamespaceId(namespaceId, operator);
}
public Item findOne(String appId, String clusterName, String namespaceName, String key) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace == null) {
throw new NotFoundException(
String.format("namespace not found for %s %s %s", appId, clusterName, namespaceName));
}
return itemRepository.findByNamespaceIdAndKey(namespace.getId(), key);
}
public Item findLastOne(String appId, String clusterName, String namespaceName) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace == null) {
throw new NotFoundException(
String.format("namespace not found for %s %s %s", appId, clusterName, namespaceName));
}
return findLastOne(namespace.getId());
}
public Item findLastOne(long namespaceId) {
return itemRepository.findFirst1ByNamespaceIdOrderByLineNumDesc(namespaceId);
}
public Item findOne(long itemId) {
return itemRepository.findById(itemId).orElse(null);
}
public List<Item> findItemsWithoutOrdered(Long namespaceId) {
List<Item> items = itemRepository.findByNamespaceId(namespaceId);
if (items == null) {
return Collections.emptyList();
}
return items;
}
public List<Item> findItemsWithoutOrdered(String appId, String clusterName, String namespaceName) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace != null) {
return findItemsWithoutOrdered(namespace.getId());
}
return Collections.emptyList();
}
public List<Item> findItemsWithOrdered(Long namespaceId) {
List<Item> items = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespaceId);
if (items == null) {
return Collections.emptyList();
}
return items;
}
public List<Item> findItemsWithOrdered(String appId, String clusterName, String namespaceName) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace != null) {
return findItemsWithOrdered(namespace.getId());
}
return Collections.emptyList();
}
public List<Item> findItemsModifiedAfterDate(long namespaceId, Date date) {
return itemRepository.findByNamespaceIdAndDataChangeLastModifiedTimeGreaterThan(namespaceId, date);
}
@Transactional
public Item save(Item entity) {
checkItemKeyLength(entity.getKey());
checkItemValueLength(entity.getNamespaceId(), entity.getValue());
entity.setId(0);//protection
if (entity.getLineNum() == 0) {
Item lastItem = findLastOne(entity.getNamespaceId());
int lineNum = lastItem == null ? 1 : lastItem.getLineNum() + 1;
entity.setLineNum(lineNum);
}
Item item = itemRepository.save(entity);
auditService.audit(Item.class.getSimpleName(), item.getId(), Audit.OP.INSERT,
item.getDataChangeCreatedBy());
return item;
}
@Transactional
public Item update(Item item) {
checkItemValueLength(item.getNamespaceId(), item.getValue());
Item managedItem = itemRepository.findById(item.getId()).orElse(null);
BeanUtils.copyEntityProperties(item, managedItem);
managedItem = itemRepository.save(managedItem);
auditService.audit(Item.class.getSimpleName(), managedItem.getId(), Audit.OP.UPDATE,
managedItem.getDataChangeLastModifiedBy());
return managedItem;
}
private boolean checkItemValueLength(long namespaceId, String value) {
int limit = getItemValueLengthLimit(namespaceId);
if (!StringUtils.isEmpty(value) && value.length() > limit) {
throw new BadRequestException("value too long. length limit:" + limit);
}
return true;
}
private boolean checkItemKeyLength(String key) {
if (!StringUtils.isEmpty(key) && key.length() > bizConfig.itemKeyLengthLimit()) {
throw new BadRequestException("key too long. length limit:" + bizConfig.itemKeyLengthLimit());
}
return true;
}
private int getItemValueLengthLimit(long namespaceId) {
Map<Long, Integer> namespaceValueLengthOverride = bizConfig.namespaceValueLengthLimitOverride();
if (namespaceValueLengthOverride != null && namespaceValueLengthOverride.containsKey(namespaceId)) {
return namespaceValueLengthOverride.get(namespaceId);
}
return bizConfig.itemValueLengthLimit();
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.service;
import com.ctrip.framework.apollo.biz.config.BizConfig;
import com.ctrip.framework.apollo.biz.entity.Audit;
import com.ctrip.framework.apollo.biz.entity.Item;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.biz.repository.ItemRepository;
import com.ctrip.framework.apollo.common.exception.BadRequestException;
import com.ctrip.framework.apollo.common.exception.NotFoundException;
import com.ctrip.framework.apollo.common.utils.BeanUtils;
import com.ctrip.framework.apollo.core.utils.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service
public class ItemService {
private final ItemRepository itemRepository;
private final NamespaceService namespaceService;
private final AuditService auditService;
private final BizConfig bizConfig;
public ItemService(
final ItemRepository itemRepository,
final @Lazy NamespaceService namespaceService,
final AuditService auditService,
final BizConfig bizConfig) {
this.itemRepository = itemRepository;
this.namespaceService = namespaceService;
this.auditService = auditService;
this.bizConfig = bizConfig;
}
@Transactional
public Item delete(long id, String operator) {
Item item = itemRepository.findById(id).orElse(null);
if (item == null) {
throw new IllegalArgumentException("item not exist. ID:" + id);
}
item.setDeleted(true);
item.setDataChangeLastModifiedBy(operator);
Item deletedItem = itemRepository.save(item);
auditService.audit(Item.class.getSimpleName(), id, Audit.OP.DELETE, operator);
return deletedItem;
}
@Transactional
public int batchDelete(long namespaceId, String operator) {
return itemRepository.deleteByNamespaceId(namespaceId, operator);
}
public Item findOne(String appId, String clusterName, String namespaceName, String key) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace == null) {
throw new NotFoundException(
String.format("namespace not found for %s %s %s", appId, clusterName, namespaceName));
}
return itemRepository.findByNamespaceIdAndKey(namespace.getId(), key);
}
public Item findLastOne(String appId, String clusterName, String namespaceName) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace == null) {
throw new NotFoundException(
String.format("namespace not found for %s %s %s", appId, clusterName, namespaceName));
}
return findLastOne(namespace.getId());
}
public Item findLastOne(long namespaceId) {
return itemRepository.findFirst1ByNamespaceIdOrderByLineNumDesc(namespaceId);
}
public Item findOne(long itemId) {
return itemRepository.findById(itemId).orElse(null);
}
public List<Item> findItemsWithoutOrdered(Long namespaceId) {
List<Item> items = itemRepository.findByNamespaceId(namespaceId);
if (items == null) {
return Collections.emptyList();
}
return items;
}
public List<Item> findItemsWithoutOrdered(String appId, String clusterName, String namespaceName) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace != null) {
return findItemsWithoutOrdered(namespace.getId());
}
return Collections.emptyList();
}
public List<Item> findItemsWithOrdered(Long namespaceId) {
List<Item> items = itemRepository.findByNamespaceIdOrderByLineNumAsc(namespaceId);
if (items == null) {
return Collections.emptyList();
}
return items;
}
public List<Item> findItemsWithOrdered(String appId, String clusterName, String namespaceName) {
Namespace namespace = namespaceService.findOne(appId, clusterName, namespaceName);
if (namespace != null) {
return findItemsWithOrdered(namespace.getId());
}
return Collections.emptyList();
}
public List<Item> findItemsModifiedAfterDate(long namespaceId, Date date) {
return itemRepository.findByNamespaceIdAndDataChangeLastModifiedTimeGreaterThan(namespaceId, date);
}
@Transactional
public Item save(Item entity) {
checkItemKeyLength(entity.getKey());
checkItemValueLength(entity.getNamespaceId(), entity.getValue());
entity.setId(0);//protection
if (entity.getLineNum() == 0) {
Item lastItem = findLastOne(entity.getNamespaceId());
int lineNum = lastItem == null ? 1 : lastItem.getLineNum() + 1;
entity.setLineNum(lineNum);
}
Item item = itemRepository.save(entity);
auditService.audit(Item.class.getSimpleName(), item.getId(), Audit.OP.INSERT,
item.getDataChangeCreatedBy());
return item;
}
@Transactional
public Item update(Item item) {
checkItemValueLength(item.getNamespaceId(), item.getValue());
Item managedItem = itemRepository.findById(item.getId()).orElse(null);
BeanUtils.copyEntityProperties(item, managedItem);
managedItem = itemRepository.save(managedItem);
auditService.audit(Item.class.getSimpleName(), managedItem.getId(), Audit.OP.UPDATE,
managedItem.getDataChangeLastModifiedBy());
return managedItem;
}
private boolean checkItemValueLength(long namespaceId, String value) {
int limit = getItemValueLengthLimit(namespaceId);
if (!StringUtils.isEmpty(value) && value.length() > limit) {
throw new BadRequestException("value too long. length limit:" + limit);
}
return true;
}
private boolean checkItemKeyLength(String key) {
if (!StringUtils.isEmpty(key) && key.length() > bizConfig.itemKeyLengthLimit()) {
throw new BadRequestException("key too long. length limit:" + bizConfig.itemKeyLengthLimit());
}
return true;
}
private int getItemValueLengthLimit(long namespaceId) {
Map<Long, Integer> namespaceValueLengthOverride = bizConfig.namespaceValueLengthLimitOverride();
if (namespaceValueLengthOverride != null && namespaceValueLengthOverride.containsKey(namespaceId)) {
return namespaceValueLengthOverride.get(namespaceId);
}
return bizConfig.itemValueLengthLimit();
}
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/message/MessageSender.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.message;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageSender {
void sendMessage(String message, String channel);
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz.message;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public interface MessageSender {
void sendMessage(String message, String channel);
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-common/src/main/java/com/ctrip/framework/apollo/common/datasource/package-info.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* 携程内部的dal,第三方公司可替换实现
*/
package com.ctrip.framework.apollo.common.datasource;
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
/**
* 携程内部的dal,第三方公司可替换实现
*/
package com.ctrip.framework.apollo.common.datasource;
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-core/src/main/java/com/ctrip/framework/apollo/core/spi/Ordered.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.spi;
/**
* {@code Ordered} is an interface that can be implemented by objects that
* should be <em>orderable</em>, for example in a {@code Collection}.
*
* <p>The actual {@link #getOrder() order} can be interpreted as prioritization,
* with the first object (with the lowest order value) having the highest
* priority.
*
* @since 1.0.0
*/
public interface Ordered {
/**
* Useful constant for the highest precedence value.
* @see java.lang.Integer#MIN_VALUE
*/
int HIGHEST_PRECEDENCE = Integer.MIN_VALUE;
/**
* Useful constant for the lowest precedence value.
* @see java.lang.Integer#MAX_VALUE
*/
int LOWEST_PRECEDENCE = Integer.MAX_VALUE;
/**
* Get the order value of this object.
* <p>Higher values are interpreted as lower priority. As a consequence,
* the object with the lowest value has the highest priority (somewhat
* analogous to Servlet {@code load-on-startup} values).
* <p>Same order values will result in arbitrary sort positions for the
* affected objects.
* @return the order value
* @see #HIGHEST_PRECEDENCE
* @see #LOWEST_PRECEDENCE
*/
int getOrder();
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.core.spi;
/**
* {@code Ordered} is an interface that can be implemented by objects that
* should be <em>orderable</em>, for example in a {@code Collection}.
*
* <p>The actual {@link #getOrder() order} can be interpreted as prioritization,
* with the first object (with the lowest order value) having the highest
* priority.
*
* @since 1.0.0
*/
public interface Ordered {
/**
* Useful constant for the highest precedence value.
* @see java.lang.Integer#MIN_VALUE
*/
int HIGHEST_PRECEDENCE = Integer.MIN_VALUE;
/**
* Useful constant for the lowest precedence value.
* @see java.lang.Integer#MAX_VALUE
*/
int LOWEST_PRECEDENCE = Integer.MAX_VALUE;
/**
* Get the order value of this object.
* <p>Higher values are interpreted as lower priority. As a consequence,
* the object with the lowest value has the highest priority (somewhat
* analogous to Servlet {@code load-on-startup} values).
* <p>Same order values will result in arbitrary sort positions for the
* affected objects.
* @return the order value
* @see #HIGHEST_PRECEDENCE
* @see #LOWEST_PRECEDENCE
*/
int getOrder();
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-biz/src/main/java/com/ctrip/framework/apollo/biz/ApolloBizConfig.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@EnableAutoConfiguration
@Configuration
@ComponentScan(basePackageClasses = ApolloBizConfig.class)
public class ApolloBizConfig {
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.biz;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.Configuration;
@EnableAutoConfiguration
@Configuration
@ComponentScan(basePackageClasses = ApolloBizConfig.class)
public class ApolloBizConfig {
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/app/access_key.html | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="access_key">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.AccessKeyManage' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container project-setting" ng-controller="AccessKeyController">
<section class="col-md-10 col-md-offset-1 panel hidden">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">{{'Config.AccessKeyManage' | translate }} (
{{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> )
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body row">
<section class="context" ng-show="hasAssignUserPermission">
<section class="form-horizontal">
<div class="alert alert-info no-radius" role="alert">
<strong>Tips:</strong>
<ul>
<li>{{'AccessKey.Tips.1' | translate }}</li>
<li>{{'AccessKey.Tips.2' | translate }}</li>
<li>{{'AccessKey.Tips.3' | translate }}</li>
<ul>
<li>{{'AccessKey.Tips.3.1' | translate }}</li>
<li>{{'AccessKey.Tips.3.2' | translate }}</li>
<li>{{'AccessKey.Tips.3.3' | translate }}</li>
</ul>
</ul>
</div>
</section>
<section>
<div class="row">
<form class="col-sm-8 form-inline" ng-submit="create()">
<div class="form-group">
<select class="form-control input-sm" style="width: 450px;" ng-model="addAccessKeySelectedEnv">
<option value="">{{'Cluster.PleaseChooseEnvironment' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="addAccessKeySelectedEnv == ''">{{'App.Setting.Add' | translate }}
</button>
</form>
</div>
</section>
<!--application info-->
<section ng-repeat="env in envs" ng-value="env">
<hr>
<h4>{{'Common.Environment' | translate }}: {{env}}
</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'AccessKey.ConfigAccessKeys.Secret' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Status' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModify' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModifyTime' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Operator' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!accessKeys[env] || accessKeys[env].length < 1)">
<td colspan="5" style="text-align: center;">{{'AccessKey.NoAccessKeyServiceTips' | translate }}</td>
</tr>
<tr ng-show="accessKeys[env] && accessKeys[env].length > 0"
ng-repeat="accessKey in accessKeys[env]">
<td style="text-align: center;">{{accessKey.secret}}</td>
<td style="text-align: center;" ng-style="{'color': accessKey.enabled ? '#5cb85c' : '#d20707'}">{{accessKey.enabled ? ('AccessKey.Operator.Enabled' | translate) : ('AccessKey.Operator.Disabled' | translate) }}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedBy}}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td style="text-align: center;">
<a href="javascript:;"
ng-click="enable(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Enable' | translate}}</a>
<a href="javascript:;"
ng-click="disable(accessKey.id, env)" ng-if="accessKey.enabled">{{'AccessKey.Operator.Disable' | translate}}</a>
<a href="javascript:;"
ng-click="remove(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Remove' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</section>
</section>
<section class="context" ng-show="!hasAssignUserPermission">
<div class="panel-body text-center">
<h4 translate="App.AccessKey.NoPermissionTips" translate-value-users="{{admins.join(',')}}"></h4>
</div>
</section>
</div>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/AccessKeyService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/AccessKeyController.js"></script>
</body>
</html> | <!--
~ Copyright 2021 Apollo Authors
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
~
-->
<!doctype html>
<html ng-app="access_key">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<link rel="icon" href="../img/config.png">
<!-- styles -->
<link rel="stylesheet" type="text/css" href="../vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="../vendor/angular/angular-toastr-1.4.1.min.css">
<link rel="stylesheet" type="text/css" media='all' href="../vendor/angular/loading-bar.min.css">
<link rel="stylesheet" type="text/css" href="../styles/common-style.css">
<link rel="stylesheet" type="text/css" href="../vendor/select2/select2.min.css">
<title>{{'Config.AccessKeyManage' | translate }}</title>
</head>
<body>
<apollonav></apollonav>
<div class="container-fluid apollo-container project-setting" ng-controller="AccessKeyController">
<section class="col-md-10 col-md-offset-1 panel hidden">
<header class="panel-heading">
<div class="row">
<div class="col-md-9">
<h4 class="modal-title">{{'Config.AccessKeyManage' | translate }} (
{{'Common.AppId' | translate }}:<label ng-bind="pageContext.appId"></label> )
</h4>
</div>
<div class="col-md-3 text-right">
<a type="button" class="btn btn-info" data-dismiss="modal"
href="{{ '/config.html' | prefixPath }}?#appid={{pageContext.appId}}">{{'Common.ReturnToIndex' | translate }}
</a>
</div>
</div>
</header>
<div class="panel-body row">
<section class="context" ng-show="hasAssignUserPermission">
<section class="form-horizontal">
<div class="alert alert-info no-radius" role="alert">
<strong>Tips:</strong>
<ul>
<li>{{'AccessKey.Tips.1' | translate }}</li>
<li>{{'AccessKey.Tips.2' | translate }}</li>
<li>{{'AccessKey.Tips.3' | translate }}</li>
<ul>
<li>{{'AccessKey.Tips.3.1' | translate }}</li>
<li>{{'AccessKey.Tips.3.2' | translate }}</li>
<li>{{'AccessKey.Tips.3.3' | translate }}</li>
</ul>
</ul>
</div>
</section>
<section>
<div class="row">
<form class="col-sm-8 form-inline" ng-submit="create()">
<div class="form-group">
<select class="form-control input-sm" style="width: 450px;" ng-model="addAccessKeySelectedEnv">
<option value="">{{'Cluster.PleaseChooseEnvironment' | translate }}</option>
<option ng-repeat="env in envs" ng-value="env">{{env}}</option>
</select>
</div>
<button type="submit" class="btn btn-default" style="margin-left: 20px;"
ng-disabled="addAccessKeySelectedEnv == ''">{{'App.Setting.Add' | translate }}
</button>
</form>
</div>
</section>
<!--application info-->
<section ng-repeat="env in envs" ng-value="env">
<hr>
<h4>{{'Common.Environment' | translate }}: {{env}}
</h4>
<table class="table table-striped table-hover table-bordered">
<thead>
<tr>
<th>{{'AccessKey.ConfigAccessKeys.Secret' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Status' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModify' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.LastModifyTime' | translate }}</th>
<th>{{'AccessKey.ConfigAccessKeys.Operator' | translate }}</th>
</tr>
</thead>
<tbody>
<tr ng-show="(!accessKeys[env] || accessKeys[env].length < 1)">
<td colspan="5" style="text-align: center;">{{'AccessKey.NoAccessKeyServiceTips' | translate }}</td>
</tr>
<tr ng-show="accessKeys[env] && accessKeys[env].length > 0"
ng-repeat="accessKey in accessKeys[env]">
<td style="text-align: center;">{{accessKey.secret}}</td>
<td style="text-align: center;" ng-style="{'color': accessKey.enabled ? '#5cb85c' : '#d20707'}">{{accessKey.enabled ? ('AccessKey.Operator.Enabled' | translate) : ('AccessKey.Operator.Disabled' | translate) }}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedBy}}</td>
<td style="text-align: center;">{{accessKey.dataChangeLastModifiedTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td style="text-align: center;">
<a href="javascript:;"
ng-click="enable(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Enable' | translate}}</a>
<a href="javascript:;"
ng-click="disable(accessKey.id, env)" ng-if="accessKey.enabled">{{'AccessKey.Operator.Disable' | translate}}</a>
<a href="javascript:;"
ng-click="remove(accessKey.id, env)" ng-if="!accessKey.enabled">{{'AccessKey.Operator.Remove' | translate }}</a>
</td>
</tr>
</tbody>
</table>
</section>
</section>
<section class="context" ng-show="!hasAssignUserPermission">
<div class="panel-body text-center">
<h4 translate="App.AccessKey.NoPermissionTips" translate-value-users="{{admins.join(',')}}"></h4>
</div>
</section>
</div>
</section>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
<script src="../vendor/jquery.min.js" type="text/javascript"></script>
<!--angular-->
<script src="../vendor/angular/angular.min.js"></script>
<script src="../vendor/angular/angular-route.min.js"></script>
<script src="../vendor/angular/angular-resource.min.js"></script>
<script src="../vendor/angular/angular-toastr-1.4.1.tpls.min.js"></script>
<script src="../vendor/angular/loading-bar.min.js"></script>
<script src="../vendor/angular/angular-cookies.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-loader-static-files.min.js"></script>
<script src="../vendor/angular/angular-translate.2.18.1/angular-translate-storage-cookie.min.js"></script>
<!--valdr-->
<script src="../vendor/valdr/valdr.min.js" type="text/javascript"></script>
<script src="../vendor/valdr/valdr-message.min.js" type="text/javascript"></script>
<!-- bootstrap.js -->
<script src="../vendor/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="../vendor/lodash.min.js"></script>
<script src="../vendor/select2/select2.min.js" type="text/javascript"></script>
<!--biz-->
<!--must import-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
<script type="application/javascript" src="../scripts/services/EnvService.js"></script>
<script type="application/javascript" src="../scripts/services/UserService.js"></script>
<script type="application/javascript" src="../scripts/services/CommonService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/OrganizationService.js"></script>
<script type="application/javascript" src="../scripts/services/PermissionService.js"></script>
<script type="application/javascript" src="../scripts/services/AccessKeyService.js"></script>
<script type="application/javascript" src="../scripts/AppUtils.js"></script>
<script type="application/javascript" src="../scripts/PageCommon.js"></script>
<script type="application/javascript" src="../scripts/directive/directive.js"></script>
<script type="application/javascript" src="../scripts/valdr.js"></script>
<script type="application/javascript" src="../scripts/controller/AccessKeyController.js"></script>
</body>
</html> | -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-portal/src/main/resources/static/scripts/controller/NamespaceController.js | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
namespace_module.controller("LinkNamespaceController",
['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'NamespaceService',
'PermissionService', 'CommonService',
function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, NamespaceService,
PermissionService, CommonService) {
var params = AppUtil.parseParams($location.$$url);
$scope.appId = params.appid;
$scope.type = 'link';
$scope.step = 1;
$scope.submitBtnDisabled = false;
$scope.appendNamespacePrefix = true;
PermissionService.has_root_permission().then(function (result) {
$scope.hasRootPermission = result.hasPermission;
});
CommonService.getPageSetting().then(function (setting) {
$scope.pageSetting = setting;
});
NamespaceService.find_public_namespaces().then(function (result) {
var publicNamespaces = [];
result.forEach(function (item) {
var namespace = {};
namespace.id = item.name;
namespace.text = item.name;
publicNamespaces.push(namespace);
});
$('#namespaces').select2({
placeholder: $translate.instant('Namespace.PleaseChooseNamespace'),
width: '100%',
data: publicNamespaces
});
$(".apollo-container").removeClass("hidden");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingPublicNamespaceError'));
});
AppService.load($scope.appId).then(function (result) {
$scope.appBaseInfo = result;
$scope.appBaseInfo.namespacePrefix = result.orgId + '.';
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingAppInfoError'));
});
$scope.appNamespace = {
appId: $scope.appId,
name: '',
comment: '',
isPublic: true,
format: 'properties'
};
$scope.switchNSType = function (type) {
$scope.appNamespace.isPublic = type;
};
$scope.concatNamespace = function () {
if (!$scope.appBaseInfo) {
return '';
}
var appNamespaceName = $scope.appNamespace.name ? $scope.appNamespace.name : '';
if (shouldAppendNamespacePrefix()) {
return $scope.appBaseInfo.namespacePrefix + appNamespaceName;
}
return appNamespaceName;
};
function shouldAppendNamespacePrefix() {
return $scope.appendNamespacePrefix;
}
var selectedClusters = [];
$scope.collectSelectedClusters = function (data) {
selectedClusters = data;
};
$scope.createNamespace = function () {
if ($scope.type == 'link') {
if (selectedClusters.length == 0) {
toastr.warning($translate.instant('Namespace.PleaseChooseCluster'));
return;
}
if ($scope.namespaceType == 1) {
var selectedNamespaceName = $('#namespaces').select2('data')[0].id;
if (!selectedNamespaceName) {
toastr.warning($translate.instant('Namespace.PleaseChooseNamespace'));
return;
}
$scope.namespaceName = selectedNamespaceName;
}
var namespaceCreationModels = [];
selectedClusters.forEach(function (cluster) {
namespaceCreationModels.push({
env: cluster.env,
namespace: {
appId: $scope.appId,
clusterName: cluster.clusterName,
namespaceName: $scope.namespaceName
}
});
});
$scope.submitBtnDisabled = true;
NamespaceService.createNamespace($scope.appId, namespaceCreationModels)
.then(function (result) {
toastr.success($translate.instant('Common.Created'));
$scope.step = 2;
setInterval(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + '/namespace/role.html?#appid=' + $scope.appId
+ "&namespaceName=" + $scope.namespaceName;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result));
});
} else {
var namespaceNameLength = $scope.concatNamespace().length;
if (namespaceNameLength > 32) {
var errorTip = $translate.instant('Namespace.CheckNamespaceNameLengthTip', {
departmentLength: namespaceNameLength - $scope.appNamespace.name.length,
namespaceLength: $scope.appNamespace.name.length
});
toastr.error(errorTip);
return;
}
$scope.submitBtnDisabled = true;
//only append namespace prefix for public app namespace
var appendNamespacePrefix = shouldAppendNamespacePrefix();
NamespaceService.createAppNamespace($scope.appId, $scope.appNamespace, appendNamespacePrefix).then(
function (result) {
$scope.step = 2;
setTimeout(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + "/namespace/role.html?#/appid=" + $scope.appId
+ "&namespaceName=" + result.name;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('Common.CreateFailed'));
});
}
};
$scope.namespaceType = 1;
$scope.selectNamespaceType = function (type) {
$scope.namespaceType = type;
};
$scope.back = function () {
$window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.appId;
};
$scope.switchType = function (type) {
$scope.type = type;
};
}]);
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
namespace_module.controller("LinkNamespaceController",
['$scope', '$location', '$window', '$translate', 'toastr', 'AppService', 'AppUtil', 'NamespaceService',
'PermissionService', 'CommonService',
function ($scope, $location, $window, $translate, toastr, AppService, AppUtil, NamespaceService,
PermissionService, CommonService) {
var params = AppUtil.parseParams($location.$$url);
$scope.appId = params.appid;
$scope.type = 'link';
$scope.step = 1;
$scope.submitBtnDisabled = false;
$scope.appendNamespacePrefix = true;
PermissionService.has_root_permission().then(function (result) {
$scope.hasRootPermission = result.hasPermission;
});
CommonService.getPageSetting().then(function (setting) {
$scope.pageSetting = setting;
});
NamespaceService.find_public_namespaces().then(function (result) {
var publicNamespaces = [];
result.forEach(function (item) {
var namespace = {};
namespace.id = item.name;
namespace.text = item.name;
publicNamespaces.push(namespace);
});
$('#namespaces').select2({
placeholder: $translate.instant('Namespace.PleaseChooseNamespace'),
width: '100%',
data: publicNamespaces
});
$(".apollo-container").removeClass("hidden");
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingPublicNamespaceError'));
});
AppService.load($scope.appId).then(function (result) {
$scope.appBaseInfo = result;
$scope.appBaseInfo.namespacePrefix = result.orgId + '.';
}, function (result) {
toastr.error(AppUtil.errorMsg(result), $translate.instant('Namespace.LoadingAppInfoError'));
});
$scope.appNamespace = {
appId: $scope.appId,
name: '',
comment: '',
isPublic: true,
format: 'properties'
};
$scope.switchNSType = function (type) {
$scope.appNamespace.isPublic = type;
};
$scope.concatNamespace = function () {
if (!$scope.appBaseInfo) {
return '';
}
var appNamespaceName = $scope.appNamespace.name ? $scope.appNamespace.name : '';
if (shouldAppendNamespacePrefix()) {
return $scope.appBaseInfo.namespacePrefix + appNamespaceName;
}
return appNamespaceName;
};
function shouldAppendNamespacePrefix() {
return $scope.appendNamespacePrefix;
}
var selectedClusters = [];
$scope.collectSelectedClusters = function (data) {
selectedClusters = data;
};
$scope.createNamespace = function () {
if ($scope.type == 'link') {
if (selectedClusters.length == 0) {
toastr.warning($translate.instant('Namespace.PleaseChooseCluster'));
return;
}
if ($scope.namespaceType == 1) {
var selectedNamespaceName = $('#namespaces').select2('data')[0].id;
if (!selectedNamespaceName) {
toastr.warning($translate.instant('Namespace.PleaseChooseNamespace'));
return;
}
$scope.namespaceName = selectedNamespaceName;
}
var namespaceCreationModels = [];
selectedClusters.forEach(function (cluster) {
namespaceCreationModels.push({
env: cluster.env,
namespace: {
appId: $scope.appId,
clusterName: cluster.clusterName,
namespaceName: $scope.namespaceName
}
});
});
$scope.submitBtnDisabled = true;
NamespaceService.createNamespace($scope.appId, namespaceCreationModels)
.then(function (result) {
toastr.success($translate.instant('Common.Created'));
$scope.step = 2;
setInterval(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + '/namespace/role.html?#appid=' + $scope.appId
+ "&namespaceName=" + $scope.namespaceName;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result));
});
} else {
var namespaceNameLength = $scope.concatNamespace().length;
if (namespaceNameLength > 32) {
var errorTip = $translate.instant('Namespace.CheckNamespaceNameLengthTip', {
departmentLength: namespaceNameLength - $scope.appNamespace.name.length,
namespaceLength: $scope.appNamespace.name.length
});
toastr.error(errorTip);
return;
}
$scope.submitBtnDisabled = true;
//only append namespace prefix for public app namespace
var appendNamespacePrefix = shouldAppendNamespacePrefix();
NamespaceService.createAppNamespace($scope.appId, $scope.appNamespace, appendNamespacePrefix).then(
function (result) {
$scope.step = 2;
setTimeout(function () {
$scope.submitBtnDisabled = false;
$window.location.href =
AppUtil.prefixPath() + "/namespace/role.html?#/appid=" + $scope.appId
+ "&namespaceName=" + result.name;
}, 1000);
}, function (result) {
$scope.submitBtnDisabled = false;
toastr.error(AppUtil.errorMsg(result), $translate.instant('Common.CreateFailed'));
});
}
};
$scope.namespaceType = 1;
$scope.selectNamespaceType = function (type) {
$scope.namespaceType = type;
};
$scope.back = function () {
$window.location.href = AppUtil.prefixPath() + '/config.html?#appid=' + $scope.appId;
};
$scope.switchType = function (type) {
$scope.type = type;
};
}]);
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/main/java/com/ctrip/framework/apollo/metaservice/service/DefaultDiscoveryService.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.shared.Application;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
/**
* Default discovery service for Eureka
*/
@Service
@ConditionalOnMissingProfile({"kubernetes", "nacos-discovery", "consul-discovery"})
public class DefaultDiscoveryService implements DiscoveryService {
private final EurekaClient eurekaClient;
public DefaultDiscoveryService(final EurekaClient eurekaClient) {
this.eurekaClient = eurekaClient;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
Application application = eurekaClient.getApplication(serviceId);
if (application == null || CollectionUtils.isEmpty(application.getInstances())) {
Tracer.logEvent("Apollo.Discovery.NotFound", serviceId);
return Collections.emptyList();
}
return application.getInstances().stream().map(instanceInfoToServiceDTOFunc)
.collect(Collectors.toList());
}
private static final Function<InstanceInfo, ServiceDTO> instanceInfoToServiceDTOFunc = instance -> {
ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl());
return service;
};
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.metaservice.service;
import com.ctrip.framework.apollo.common.condition.ConditionalOnMissingProfile;
import com.ctrip.framework.apollo.core.dto.ServiceDTO;
import com.ctrip.framework.apollo.tracer.Tracer;
import com.netflix.appinfo.InstanceInfo;
import com.netflix.discovery.EurekaClient;
import com.netflix.discovery.shared.Application;
import java.util.Collections;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
/**
* Default discovery service for Eureka
*/
@Service
@ConditionalOnMissingProfile({"kubernetes", "nacos-discovery", "consul-discovery"})
public class DefaultDiscoveryService implements DiscoveryService {
private final EurekaClient eurekaClient;
public DefaultDiscoveryService(final EurekaClient eurekaClient) {
this.eurekaClient = eurekaClient;
}
@Override
public List<ServiceDTO> getServiceInstances(String serviceId) {
Application application = eurekaClient.getApplication(serviceId);
if (application == null || CollectionUtils.isEmpty(application.getInstances())) {
Tracer.logEvent("Apollo.Discovery.NotFound", serviceId);
return Collections.emptyList();
}
return application.getInstances().stream().map(instanceInfoToServiceDTOFunc)
.collect(Collectors.toList());
}
private static final Function<InstanceInfo, ServiceDTO> instanceInfoToServiceDTOFunc = instance -> {
ServiceDTO service = new ServiceDTO();
service.setAppName(instance.getAppName());
service.setInstanceId(instance.getInstanceId());
service.setHomepageUrl(instance.getHomePageUrl());
return service;
};
}
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./doc/images/local-development/apollo-demo-vm-options.png | PNG
IHDR
iCCPICC Profile HWXS[R -)wH
H! JbG\ *]Qp-@Eee],Pyo9sNΝ lFU |IL#2 Fl('** @.nB[(l$u*' DAqr > @zYy<Kp kJp [Kmb f@t $tGIN 'ͅ>99+!6OO|dǰ,l3 [rţkFGKby
`*GA|ϕK qp~#9 PeA1C#lt.G#!r*̍G r?2x!'
I@ +
=T ㉞)G@q(+&L>aQ_ĨP -l 4a`ƅrҵ`-``\,'J 8`\ N
-[ %ǪyAѲ<cE1s{. *V
GA8 İ\ -l$ kFg$HGhlt
˘ViB, \=pd总nʣ`b bΆMF{ NE07n#
BO^V3 3dʣK>GmpS =! g#alNP=Coq= ,,R~1 }#.~Ėa)"vkL֊u`$xH+ath),?jc`o%fH^ܼ9B~zF<fcktw@˶7 鞍0.} *ӿF y
7kX8 e:v 3ԁF `
"A,H3`3@< A)(zl;A pen{. 0ށaAH
#Z>bX!+ H4 #%H9RlFv ȯrF H?b(UGuQStah,: MG"]nDkнh3z
@{0E`6+EbX&`eX%V5bmw`Gq&nk39x> _of ~
A`Ep' YRB%a70,|oD"hFte18D<I&>&H$-ɓIb
HM>"Y@$'br%y8*yXAED]!R0Ga.6+
}
UœKɤ,l4RRS(***)NQ+.Rܨ_bGՒGFSWRk'woh4)EKViii JJ!J\JUJJW^*+(((P.RT>|Ey@EATO@J-!Ujj
=ULԸj%j;N=ct# C_BE?KS'gST PӘ1[JFc2BٌUOt[>qq5k4yeM74?i1hh=Ƶ-hҮ>=0^}xAu,uu
ݤ{Zw@[w\__BӇ< 416046433,6l2|`D1r5J3Zgn4ho<xq]W
&Mޛ&.5m1}nibVd`vߜfmo^c~݂hjeբt̰bZ9[Zu[ݬ5ַl6>66
6 pbۗ'$OX3vNvv٫ه۷ٿvt8T9\w9:.tlu|5j"obNtNKڝ88 ]]R\rUwr]zGwgyxdyx>loҮI=
=ٞ;<{^)^۽z
5ޏXF,.k7뙏O^vBþ;6< 4 Ll r
t2 &Vn'>d0%t~0jXLGk'ߏ0DDȐȵ̢~B5jhyc13cļ]{/<N ?->}BEBOIɤCS7iZ鴛ͦϞ~qf*d<BHIHٓ ɮanI q6p^pYu~',3"yg ʌ 3UfpYYY# M9䜔#5AL^<Ҽ|0n".j-Pǜ'qoWaUYV-1r9ϊ~mg0o>w,@.h_hdaߢEu)^lW\QvIݒE%
TTXzkmee oZ[vܮ
ΊK?瑕i+;W9^M\-X}s
Պk'm^\W/VNܶAgcMƛVo9c*ߪ-:[oyj5qmƴr'qgΧwڻwEםwߣgU n;mo>}6;M~?~M恰]6 290pY3<y%5H6ÿV{h1cS 9QtbdɁS lw:3St
;{\}ΟyEG.^j|éN tlr˭{RWO]vz7"ntߌyִ[=ɾn{=PyPPa?,sQ̣{9_<=WϏw1y/JTsKb18Jj7ZojN|>5]λe >}txS§gó>>obk#9##yl![z`C x] - (^RAdE) gRq@" 6 cY ut kr9:|Q
ad. 6 GF|d'"<o
Q k pHYs % %IR$ @ IDATxyP\7@E } Ђfbq|f\[[SuVuzޚfrSI&8v,G-[$k#Z !bmE 5X|sݧ } =</ص;p (@
P (@
P (@
P |*§0
P (@
P (@
P (@
P@`7(@
P (@
P (@
P AE@g (@
P (@
P (@
P` (@
P (@
P (@
P AE@g (@
P (@
P (@
P` (@
P (@
P (@
P AE@g (@
P (@
P (@
P` (@
P (@
P (@
P A`""(LF
P (@
P (ZږbX'
P |$ u>f1 (@
P (@
P (@
P G^cVB (@
P (@
P GNr (@LezW^5g)@
P (@
P-0>6| (@
R
(@
P (@
P (@
P |'@Y(@
P (@
P (@
P TT
P (@
P (@
P (@
Pw Κ%Q (@
P (@
P (@
P@Xq (@
P (@
P" |wuO-/Vʕֹ,o'&@f5
P (@
P (@
P`ffԤ H Xњ`j &:+=?3 Y$
P yߘ%P (@
P (@
POzѽ4V!$$X)zyjy ݻ)<zC}ClE
Ds|R]B
P (@
P (@
<kRof'tX~W~tvvb|̂5aR3 ϛ2G
P`V,~Xe!ˢ$Mɢѳ`
P (@
PXSObVZ%DN
xG.>> \bM.GO¢ %Bx uuոP$ec]H Vca4w&+܋7!X i bxޒ#Tǝe&_lZ2U[ԊrqKMA4<zV x<f$_3`3ՙ"sQfF
P (@
Pp_@
[bL)Pexg f\'^!5'Eiy82FSq3
BIyOKK÷+ V:y, ߿KaQY||λ~"
՟}fT *MW|]|/G>?#zf?G}!ͻP ,#=hQom +V.ϐ`Ħ&!BTK 6,²g~Key([W.{X%]Z\D/ WO_A`}m>*rjeYu_
y97_Ɩ+a+^_ONt6J$ (@
P (@
,q\tR:o.R P
ֽ`?ʊؘH[e
uu`g R?b[.$1%Y}/MQr>Y;>_R9ꀀUbW`L
ݳjU8UJ0Y! ^So|02蕋%8"{pGE9el\K1rNfLj `8IwyFzԹrqfG*^9mYQdm'?[ rb V cAx86V{I@[<" $f䣴 ϝ@qYDŽܦ (@
P (@
, ^fԉtM4V)cJ?e?E/w~h%82 [&!9 Pf'>x }>oɣ1Y `d)]9lBoEb ~]H3 x=YTB%]YRBQq`]nm L#$"YԞNYp|G.j<7?NE磊=7l'o[d4 N]=
}{{ؖF7֏[& Z LP"ȱ(e#\[ByqHTFp/!D=.LHT !>Wb]l a," 6.^)?)@
P (@
P$ [hn}41H)F[1xi]|xS,{qS-}R,B&2(=0աcq.kFZCb+.pG`:BK`G'N5: RBVc[./[p]7q4;sr$uaQ}q EM,g
R3b JEFfތ+aӱT_cb_.ګSwhlۚtJ9rw BQu lGPzhGK{Zvp (@
P {[hNJQ9MY.O.*O { b2"P[+O|>?I/.eO-`9<־Z?3-,B7 ܾo/LMGFr5bz}j0̂DHwGÐWP`}4ԈZ̢MH^ն{ou><B+R{p?nW7`PvY%DIt8鴦\[=2rY%aш.9>41`8ubJWP?^z0Y9[
Әx8:_+#-Qaw;ñODyH%үI,g&:ӣhmtXhE=eZPH+H]
y@-itl웖Mdg 0a-7@xC<,lt3{STױ>w'+N>o}܇0u`n5)H^uZ{F3-#Gtkw| \='ZIA
"VߌxF,CNV.+L~d2tc.;ua7.Fs_^;Ǣts1Nԩi+ iε \ (@
P (@
V 19F_N*q)HԦl
!A +:z)ؐ*F %;}$}Z9 k \m}/uh6ݿO(}и-=ʋoq{I ĥҠa)Z&XDir -5hґ.GWC6tA6λ<yx!1^ څ %LcnRd{P:s="aL:ɱ' ) s> ߕ#/q z4FEJAaMl*Y)n.ܷCOj.އcU$ QQs_ AA.*ǻ˧6^\
9$SK>ƩtCt#zӖr6Tc1mGT
KNv i`)I3OW-oHAJ2)].7q+0ة" g;36
^!hiV>>o+:A^oS!amQN[/CZ-Oƒ(}ċ+ނZ<g {
%.¶ͅb.S4eطk:ԧ>EyY1.<+g3/KJV}%/!"!H~h uOko؊K8ZyS+͵&E0뗌tJ 4VzI6i"%EXh=JلXqM"v;{]oҽؓSI.#~\<'J1Y`wEݐ=hv=3_j(. HiiJnc%N;([ t ;?>Jg7g\~R (@
PPS>^
u5ҽo{2[okpL
]%NUSmj2 _{ԑr#m8s W[Ye.PJ^T[x$_w ~}7֊X={ (M/CQZ2l/ tN^+طPߚhz݁[(7?QipڥmxCBx- R[v @gE|{<Wq(WЈRK_?9HL
_7F7oxvo7R+bOVⓓ״<~oŞrܹRNG rCMx`uWo-1 Dox m┸Ml<Ep@ NUώ,xo"HgM 2
?W ; UBuG#O,} e Nj?ǫlg^zl/-Ŧ2vݱwz`kzUz7D]i虜ciZ^GV 5I6{A:m8\l}} Hg;%Hg[x1!gF\>5 |sK?b$2ZBİڍn%lڮ_oܼZ \;k}, V\!=#G#?
>ݶ Hg4+ۋMOģ-.鄬QΖ:MA:iǔ/]{ҵ{y!sw낁 (@
P |Տ;pߖڌ
- sVMfb
+ tI֫d=bq[tRyO {_* q7}dZ}/;]ؽ'Az mpE%߷Rhr}W9㝷_Y,@ Uh{P4?y t#o!k5\?)OqNSGOvݾ3^s'$ AJ @kwtRQ+St N!%CԹ;杸yԞp9]yKmGnNJbPkt5ɪ gk7c<,Ʌ#R@7p 2Jog#Qk`b[8WYֻį(lJv>Ftv:%XM(6vd:0 MzփHEs }}h"nt/\F3" Шls!B.{gP]Ulڳ)9'qbN<eݮ¥r/l[b24}iOOq=6;-MxEvB"SDu;rl)*ۊchV϶$XB҅AуI$qwtI̯]yصW?F;pb- '-)²AmYډ` p{EGjn!oC>W璆puMMx*J7<8%y7M㈜߾@ ReګNQ8yNd1mMת1҆Qڏy("~ &kVډ ]3o9a<|ܿ<{*'(@
P (@
Pk\X+L? pN{P:y,wԈiY: Bqx3) E Qs^mޯ DllTjaߗ5,ĕx~*j.Nl)#I]7QPQn}% nƩsqb-}kIA3-k}!|#fΟs
&Ѷ(oN[oõY;ġwI<;Ͱ}`w{9_ :SJj[eėV!v7X\kr jn7u
A-sΜMZLyVl'2/+aضрۑ+1HIKǥ6Ëi?,]&4αG]&sܘNd,VDwϤMc}ws+Cttus>/53{
q)2^p?m͵gpw_+nƥ#ҵ>+UlZilnKts Trӻ[Et͂QXƋK-;k{vp5 *QI(㯌o =e6.|:\߃J 9&8К& 6'Cno3rhT\w ̓wBA5t 4Iۖd%˟=c~ Ì3(S\mRRPd*1 6tvnEtx2²w]@.|ە&~K`yiƑ?|i
J;[a6؆ 5볦7V0CIZBu&\ƄU?N[OU_Tey8"ϱu{21bJdϼL[K#M⺝PF|#~F_gI7gvCߡpܳU
P (@
PX/gm
*fu`ҏ
0:zŻnW7]u#8{GZw3 ?ޙ%' s$_O {_,}XcR3*? δ*Gp6L{/W+ -÷>CmsT/ďM^b('>sq; Tr)q!]<.b("5::$ $Oi'ňvC=f=f;DP 5oj~kYM5ܓ -&?_~/oLM
pU;D:aNd!}T5;!?w6?(zOᓯ/]3`eq |G^|5mcZyI
)#j:{ѤF1"CKS_K"Ղty&|[ʈQ: p //OXܵ?Q_kO!E 9# {gǏxJ4f5H z0tO~уSNx8{Q˟bx*]N=/zDs ڼq9v+HZNƅuyE "E'-=hQ&-f=gݮ+o\S=bN~E!IP }]*y F-H+K ي{;E:7"Q%ڶ4ܸjxݮabh%|><VO [*=p\<{
(@
P (@
P7Nk4Hw\#U]_x~ ӇQkC,v4=~0H'RqCx>qy.HܡtE_#9ξQ{Y hQYyM{zuq;WCQa*ӡPɣa#^m@btW\D%!#TiA:bҥKT[*S$eWګ[͗uT + 9h[40JMb<%|8;*W냝gw.Χ GaJ,@UCkg_{=XwŬY 8HKK8_«-_. z5.ڙKz_bM\MAFJ"bb [Z(l*ǕMsnHK]]۵ ZL.撓:uCz0$lqi]!psZ-y)>J?
oW{og
qI]Vt `ރMhmނDwݝ/~.U<[.JWic(P.e<܍>qIʹEw0 >=Ru<{JuB
P (@
Pφ2[^{=bۄtd%#!.1IvHêm}D|N785mx{! Y/O#zNw^<~U*ε>q8=>+@
s0= c ! {,ġSthm`dfy z{aj2y[|: dw
1GIԌ WuUb(d9r kmօ$~K÷ Z>B?y?G|?`hCG>mٴ
.I}Zy w9#Z7LS=1Ks.:u߄kҏ@\j[r0ubn5k;{>5ccO T'S_/9a$ODDGCk[HK|sQ[t% -+
.r.#;uтQ"+"?z.' p<?J^Qw1Bx.Q呚D|xﾜZ5~җ2{JL ϳ׆G)@
P (@
P FUҏ-Č ԌSļP
r_UO܇jLc`כWԱvp>qn{;,}q \EgȊzg\=|Z,gnj7Qe ;9x9u.ͺGvΩt'S3=CAl8sgnGI`ꇿ{i3M f5/N}h 6/Da1ިrb &L`/\ 'O~ @/&\W +VatY]=UP_G[ xMyb(uM*|p<SP扉Yt)GXKx~~6Ț4$k* vQs1mω@4SVV#(S}cxNζc
~öybxb<í2=8"T~_njCqcݬ j~CT^ZYK,̖ (@
P*zJPݭ
~[汋GRZԙ\n__ҹ3yo(F7 aMBfbg91ZKP($DX0|0j,|VCM
Ӊ^~s~hqIWU~-F6 ݰh4ӳ0.ɳ,9qfN po4\ąKb-?!koՙ_U @'@r 'z%K'誽rʻMIMž\%b7e* D2Tu%Vy?W #3Aiǽq( %ZKHFV"65v (waޡ+S\\ vcj( %JP+H+ BU$Z~t9[_\c^?z:%qwuR
P (@
Px J"M1 ӕk.{ 6AUFH5<xSWi,}v~ ėcA+5{ߘ[k#-Q)HJCZf2l c
Q:: 撴bZK6WQA,}~|Ũxb98-m!8X](Ns3K-ix\
IFmyhR1 BRt\<VуF^"!N/C[8y1H'i*c9 #JcZx$ %8%u ];>l-Mvɺf=73RP"쟗%je1P9(}v=%+zڭEҴ.9U" #=O ~>f%0 鯜2v d xKl&0LB1afBCQ9ɩ' a/[ R!+ i[ f顩oTKqpvߙlQ|%sO~ٓug^ (@
P (
DʼqJo)o~*mʝ wߋRf"@zWR'ļt[0ԝjKq#, Qb uo 2}; jR=D _`ҝTWj/)p U7R =Sz79ڻK.JBrS?FGC;a\b *ҕmgIC IU:soO.>ƄRPD ywT!^QyM0{lOq.`k?? ^rX_f~g??
lMqls>#PbRORPzӍbdȸӳoJu-U::aguV1~?'mZ6^NHq|ӒꭞC(ղb+h@9 l_^?Ԝ#vÛFݣ[ [5fآ|CW"VXlgdm>W]1nCEqa흚!FpZ9 <ܯ9 (@
P (@
S! ) {V+v-Rzә{: Uwޗ.E J\Ko~.bjEOz8\jVWڍ6 ܼWNph-?%? )珏*$ր3->}J[mnRJwP/0/ߌ&!:ڃ[ׯMWԲ؝GI{y⤊[ZpI im547[w4Xzp$y -a ߜH]g;%z |&{{ބHD|ijGo4 W !HG^RaܾibͰG(Lg<[9vTD~s ڻ0.X,'aoCRӉ'ཟD@[\]oFܘ }u
h,A ɊŞ n}!!)=9 /ܹ(맧kCw:ރv,B-"Y"j<|WwS_܋rPڻ:? %HT1Y<Q^WE\HFNrw$Ԋ{8ķVؿ9ТRĐ{ 8<;ұ-zq w M/@?pND$`+/k_(>: ٌYWzϩ^ 8i_I(@
P (@
Po¦{t|Mh5cL~\^x楯ޯ.}s=ҒEOfkA)\kDEw/LcpD-czplrͦALCzv *- ksׂ12Kh[95ګQ )w Wuy aCzx뚜[ׯ/1OS[ax?Y7#Y :WM;&bﴵbn6 1[گp*1 Bmm=z'a w<a[_ CF>[ݤs0ӯE/"Y -Q`PFǕK$=hҲj5kLP`}KlƩHS|- YEaMǺpy- %4t5ԲtN;s-h:S<n ?s/D C^;Z HKV)ChI\BAH¹ZI.ɳ X$zHnEAŹ +W-ON~lTm.ײԠҮNv?>uQyvT =7cK eC.G!N
otĭHl5B='aH%4H.\<+NROJ+{O7>+S (@
P3#v/R: ?ޓoK R"3 _~yJ{;RNYU |_soR32g1HP%}UG nXc{w Wpoq'Ee/ }C
WpIVɺЊ;K-_XTq>35_<ֺ8;/>wkYXLm@5IoQiR6tЋODj.-GR78jomPwW]? obd@/ZohNʪSoHeRՙ}$kTSjiW)"ˀp_vhJ7ؓGcoK01!V9.O&.v<(mObⱚ *|۽m[ý8Ňtv| Նul>_ =+~IhwZE{e|OQ5 xDSe f[ ' _'xv7![pM tb#=}]L?rݵY J = /~} W6;EsZ:XT]]yP)XPuWGp-̢g? / \/q<)tԧWU`&> h;Ӎz<>M>y0'eQ*{lzGsb=ڏsG?3Uh[78ԏf\=il1\,3Ə1wlR=ϝ܍k<W)@
P (@
P ?~HA F)w!v\ I4tȌ|!])3U5x
,}>֕\'MO}O.<PwKS ~sw:z1 Egm\:9V__o7<SݥZl6_ ﶭ'qWylݭ w>?dض"q Ʌ6yI%k`eC}y->^p~7Ȯ&mh#* 5B7>_رkς4$ taA<U|G^ZL>z@<'^𪸨oNf|
V8Ħ -n=EW`ŊX[>=ψ+>Z{4_o[{ť PVcb]=[XdEab]Wy}9K <ޮPQx[]
rs9"k0-X-?` G1{5< W~mX\b KVS]m (@
P \Ci ܸ!fff e}k16>vY HFjM|vxv.L7^tnbOޯ.O
R; 7maQiw>~k7*\#`eƮ&g01X訡OSW D-1 =swx#~On ؿGp9'~cs (Ud,M҅tCh?߄:ܖy g롨F(~AH=ܩҮۇ `M4t I9dT,_m2jB
P (@
P F&{.J|:44cy+Mė!\+ʛr1ʓr\?=m?z_,%j5z7ǝFK-h ҉,00 oQ,? ZDpis9uUQ?^uZy7` |j聺SL
POРC:jT>a nvޛf\ ČLehs
v}55 (@
P (@
%drֆ#&&F O[!T
ن4n9;3yrO 뾔0B1Rb
F hfHAI67@s;Z7>GtAbQq ၡb,ul@3uc=#ӦN \/=Z
$U% -p鿅o N
P (@
P,0-
}aȐ{I<Hja)+ {1_ #CJ_vl2ݓ+g p/ N
,kdlRF ףGdN$:p$Ĉx(,jvW?> \d&D8%74oo9 P (@
P 5Gܤ`X/x߉Ç0ؓWey.d-Z3[. FQ^RHJpV Νf8s W*<Eݙ Sk˟Wcp^رk6 )R? ɂi(@EX0L?+Ej(}1)"7S (@
P*0>6{ Wdih@1G /no ^
(㲼xxG#.j-&!!h4-`N3U9Q`rb <Å (@
P (@cixCؘAMnP/ .<C- K (@
P (@
P (@
PB[P (@
P (@
P (@
PMdr
P (@
P (@
P (@
,D1
(@
P (@
P (@
P Xfz&_E(ER (@
P (@
P (@
xR=<ɼ(@
P (@
P (@
P (0G#R8M:W(@
P (@
P ,kJ
PW*2yϖ9S (@
P (@
P (@_pK_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B`/
q,cdxq)
DDF6> O @ IDAT \in (@
P (@
P (@;(@
P (@
P (@
P |# uJ!~c7,
WK֬ݚS;-kP (@
P (@
< >
)
U~R>췑- (@
P (@
P (@
P`> 鿡 ݼ,s (Q+ .<?|n63 ]9 (@
P (@
P8G͘ (@
P (@
P (@
Pn 0P6!3 (@
P (@
P (@
PSP (@
P (@
P (@
Pm&p!!ZL ]L6 (@
P (@
P (| \OICdH3xh w1 .۳c] 0
ͻr
4ɖ"Ց>>fA (@
P (@
P (@
@`YҋmCXv U[`2:o܈ lKKHt (i{v?y/?O
P (@
P (@
PxI.<#| \5옘8mvA `lRe1{tax}k,VAϵz|h,lkϳwP (@
P (@
P (A.^ފdi@H2vw10~A!HLBVn *oC͠`?"Iƃ~|~
φF?Faoh_kl F:5/ ǀ(@
P (@
P (@
PXK>P_kl_Fb6p`[ Z5.y4ꮎ^ 9fT]uIk3:9ڶ1yr8L)@Thm ?
}G J13 5'q&\> (@
P (@
P ( hѣ%eis[s_fmI\qɩW] r6+N<zL=4@gC8/=3 QA\!2%0Ւ¢#1hWf8mP3Dřդ@H6D!bu63 1DfO mbL5It՜BQ$grV]UqN8g%12!
ZJ * pY$FQ2bs:f N>F`R |{}HeQi3
G5M\ TuHN*> `/mxz^xg" : =< (@
P (@
Pt.,;F=@U rVTN1"r1'Jā\$)d* g,4_o]ըLTyL&e0F鹤n|{]oBS"YY:o'ڭ"up>x~Ql,mq.ǶBݨGw@vʩqj2>=
'6_#eιxԹv:CKǸ KQl5Fyq?*/T- }6 eiR}Ml}b\_k-(}TRpdn?i858J&j6==eߔrY >aY ?ů뵓K \(@
P (@
P (@
x_`I\
XQ;N=l[ ѺJ*7.-a~Ra
9n"kc1~!z}|Ůӏn-DvxC4=Ҧ]hfR Jߺq~qjΖXe_zt> VrzF=~EwΊs۟^iNlMN+V[QWNEX zs *O,>u}[=a[Ȑҋ7$";I&- PclKgzu_Jx;%1W
P (@
P (@
PV% кmuu٬%`>H` pKQ*u]tЂ|eQ{[8`=
E\[@d}6e 1>XjԠ&ojkcc\NV.A{U fD'`SI5+[*/~Lf:͘Z 1<oHv4
Cc[K3/-h:h&zd5[U 1礮G-u]' I,mn?:c7Tߥ @b. x ;/ ǝN-u?(@
P (@
P (@
x@`IE8O,[dt t
m Μ v ʷżx5"Pcip^ !.*tnNVXwҜvQJ313
R7
rnx[Z |%~DYpEiQ
oR{mF7|fR!hnTOkW볨W|߭F _-~IB7S1o߿Zj=?)DԮGMn[ C^i#`P9`
5ha)Z`] '-s:H#)*g`<#cS|V >qM. RP"Z0&% ֹ4=^,
XZqV'' /-k':Q`rRx-zXwxB:ŷ06ҳۮfhgub49ҷ/2 (@
P (@
P T]DI -N ֭v5ȥo&@ [ h B` Z{F@RyFa|%ƟH'j1rKZ5g{ & ȹm|xuwF1":ja9"[)^X
/ڈBqN)|
j6b&1 @Ω}0VbO9\G)9}f$c㑝rkwu<Itj];JQy4t9g o S{oe܋b7!>hR[4_rjjULW ,@]X^= %ꍤ+fDEY3}}5WoO#Փ,B)_3Θ)(<v*Wgk\#\
2Csp ;oVwW)@
P (@
P (@Exu+h#6cU -$JMwi+ [ո=Q됚NCL {wcJn<BQ 5+/>W!td ;|۽6$HMbh%`z2_@FV-H%Akp>C`/N̝oݝN"m^mGb(,ǣ#x EVo-絥3X݆![ͪbHD -&1 q ~ en)SRVG,+cO1 gޞvynj={t!/ain 皎w~xb%8X])H.(3B
P (@
P (@
,-% x©=\Q GL2\##ܽ/1ދl+A/YwFI:V=& PA:sΜMiC1$[=WKdV^,kǧWt̢Kh/& LƖ (I~, ]{ *kzBקyCɎ h3gi4vsW#53ELv.M^KIwjS1> y.H75)8rێ2$(ޓƳMzGmB>H7܌S.RS/S
.[kXySryq YQ ҉gxC!`˷`ڬ
؝Rsb (@
P (@
P
ybDpBֲrk.&88t^>gjy9]DW` B 5>[-(ٿ<x3x<+-;Gi1'=HV2Ö(Z&?_~/oXPP"Pm;'osߏhFw~ {BIL[_ߨsG |]HɃQXƋmJrKŧNˁ:LOCR,+=NmCk[3. N5L0!:$GnŗgDӰXO0^9к÷z ]^[Մϴ1v9r5xWySB qT;TP (@
P (@
Pgh0 5XlZn\)ܶQӴEl$ p`D猗@1ziWкA< CffgĘZzdz6 }9 ñ+-sa1q}QHO>l]%|YNeGLR\RS#hԽ8s憋k |3*jA:59L^qxn] 1C[C lDyK~Ұ
j3.댃t7ߋ D7k=HNl6ܨlxTV^Sjm<.<_yb2Pɣֿz@
P (@
P (@
~ߒY jƭTplJGYzԄ`DX/ʛo}3O?HIƥA6Fy@ȕs #6 p:998l) e.K
zF9{H~8}u~[ȱ?dLvXE A>NǫTbd~11r z] :ϝ+? I/|%?S#
1ߙ6Rwzm] b&4w` R?xy<2G7 PX<
Sb B@O2p\_^q8Mg-h =VQ~ {]jvKf=WS<`?硧\oO7LM=9 +B
P (@
P (@
ץaƍ;+W/2# ?1c4[H4^ڗ0փ;wڻQl
JlF(*;z@nˀ ,r9索چQ.v}/η9ppȨvS$1^Ne=Kf.Dn-bxK%5!⁽ND hQ9SZ'
jǞܯStO"* ZxDY
{
EE*aZb+R$F/+5ĜhJ9%.ؕ\P
ébDGzncHUolGI[_j^ZԢ]2yƦ}o`wY_>GD(w)MaB\
˸p%`$f?=f\/+x P (@
P (@
PNK<P'\X1ǎYezTC1V,"cҹ mĭdg^ᝈL" dg I
ǖшXۂIebzfuVwqݩH
ێ[} fM?1"rHvD2Ftk#PPB{432*q}^_ :@XWߘ9h<`)i7έe 7 ,bF:I>.[ ń;$o[f<t>gIB[nD2eՐnavi>.s[x@;(S<)q}'0Yk2aXi>jמ hw Zsc,/
qQH_pdn@fl>qth(@
P (@
P (|xozxД뢰yq\S7;z .D<<d 6d# 7pko\dyZ\d[DqM8"`0h">BJ- &R)]=?ޝq @ C}!p ;)LS-ɲNؾ7ʗᾪT[KիTnRNb+"۲%kgHS$A$b_Ģwg̊!] NOwק{}@>s9'oGӞ,0WnXl:&M Wkha5O19(Okv{86rE$I
( h9. <1:shVbվG!<\ix谒HܨW4S*{ Wi3( G<P,HAzV"mLGyuGk˒^N8P<˳k.hVvm=g3LIh H*6 aF"eRbwM\:*+JX1[8%^hDzZ2r PcPm;Ц>s (@
P (@
P j]q/YeE:C]]8vm;~˸ܤ X}|y,>57P}Ça$̉FIx#KE;]4̋$1=q؈
g
__?~z65~]j9,qϢ kU4eG/s6~w#K:ź>ѐh7p~qi*;hSM9\n)ۨQev/pTڄlCtpv g xdH-/:Sj
3Q )یbTp3M˄/Ȃ\ *k7 Tj#CRj
+vdJ ݍ8in8gˆ\S㑨αZhi#e=٦N ݸgk8
K\bF^r-I 4a v-s =uBRb",9hǝWѻoC$q (@
P (@
PXUǮEj'vGvsHZTu
Dֱ
Wphl s ֛j>
4_ki(^ƻ4ىwSwH+CwxN:M,4%yYīٹb;!k018>K֑+Cz$!2h^<Am
f'E#-j~_>ixO; E,?nROۿW ܺۄC>/mClTÜiG])M--8cjܵ0F ;K t^ =r ̭p ]VCҚ2aGM?^k vc<S"ƍSw7>BK.d@eUӋ{."G bp_ 8ѸӥɘX+J-ޯ4tawiᘼɱ|tZ|گOWeS|_PoX)6#= T:+ >oqsCq
(@
P (@
P (Mj3ALQQ)6+܉hu&oO67-XOR|bm;Lk{zf:zD ~eW*P2SRo
F\ۀiGfDqqUCKlFjXoW~j
Mg od(DەVY+
/ -[`]e}9< !qϣ,JW204ҙ -v ۢ]fK.=)!a&0T5`hvPs0͓<9n>sn֧=a_fgZ.̺ > Oeq*!.u8[=x0&z!m4c.4E(/L7b
/R (@
P (@
P>:Y,q/K+ ݶAOaHܫdlɴ< ->-^ ?ʔ%(?$^v2x|d| I Qdm,߾:k.]ZpӋ{}qG/Fcnñَ?/? y}4w DNm__g:%wcxxQSZގƯ-Xbk ngͽEQr,[ٛ;zv-}ah*m"T[5nO%wd\,U `!Fn`:ɎWnu8q={22s{ƣteᾚEoǰv\B
P (@
P (@
@P1｝̴daaaZ/
j)q<Gq9XHD$RӒPDb['t{X6j
,Θ*ǁt<7
E!>= bjŅ. ]BF!W-G{ṗ8sSyʚu#:X쳨PSC_q! Rܣhh C8փ{>! dHi||IyX2:1f1mM|V_ek^4e@:t7Yԃ&tN#:&a!Dų$EC'A=ll3֚Yѫl4&'1<WH((GNTZ}]4](&玫
ȗzF&cp~ n4HaaJ 8rM[Z. (@
P (@
P {7f c).> ze#lTlJC^m wqz'g¿H!8Pr' PH
¤h [/kDo4w;X#RPIGD`nl@552:$c6D[݄x '釆bb> ϊY]Ҍ\;+x 1
;:1Q~VÁ;7y8!Ϳᢽ *w+{;e. G sJDFѻzV ǡhgS˸q(@
P (@
P P6Ƹ0M?Dp:qe
=cX'#˫PdXH*~q;xWai ]Ə՜jg"z+J5,ky* (@
P (@
P>.P&#c^(@
@>˳2
%ޟ/ GF~YMF*7ӡ7u7(@
P (@
P _
uC
P_eCr^S[t;8s*.\"@% H
P (@
P (@'K
uOfi)@
,|C9ޏ=ۊű>ܮƹnyI?X^ (@
P (@
P
nY (@@W+^щ)HN$#"QԵh7tuR (@
P (@
P1`Cc3Y
P%06ɳt'c (@
P (@
P <or Zo"-8ء0܈HZ 1=6
8C
8$=x\i5|L A
P (@
P (@C WG R.`u S#q3 +Q2"
P (@
P (@
P@H r<PC!'d\xx<=ѻ (@
P (@
P (@?PVS?`(@
P (@
P (@
P (X
ܭ,(@
P (@
P (@
P 84T (@
P (@
P (@
PqQ^bx
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P lsA(@
P (@
P (@
P ( dx
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P lsA(@
P (@
P (@
P ( dx
P (@
P (@
P (@
: (@
P (@
P (@
P
u7 (@ f{/rL
P (@
P (@
P '榎G#J܆ (@
P (@
P (@
P `:2:
P*Pe (@
P (@
P#Fzꩧ X} 9R,؆
u~
P (@
P (@
P (8.6&
kIj ߃ߓ1 (@
P (@
P (@
PzDc ,^l33zzz_`9CþҊ鳡nE"n@
P (@
P (@
P (['7/p|&&aHLa9}L] P (@
P (@
P (@
8* =NffgNʓԳozfF?
u~s5
P (@
P (@
P (ԓNk )
?
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P lsA(@
P (@
P (@
P ( #S LQ%DS |-7ӧ3<N (@
PǼ|/m.eʨb| 6To5Uϳ PE { abHY/-+Wk.aʊ , 3wqqRg:ڂ#G!"(37pB'b
8y['%6%G`qy -~'$; G#5(ΩaZ&Gѩ+tuB??<_`cbo:Yjĉghb ݍp6"_l;N|4)@
P (UnK?RG`t_ ^hq<
_ 1t
9q3F:im|a/r@[X #EfFg"K(@
X6fdʍtҒ\'|Azo+^VLJ$ >DD");"f ^={˽ G݈c|
uyd;l=rEň[2M.,t$폫r p?fqRm٪>o̽[^j6ƶH?*T6!cJGwa[B0 Z
4&{twy#P (@
B`ꀐu7_T4PHS70Ojm|5,ϻ% s#G>^% (@"sv }*. p$iq
:Sl6FI<Ԍ`<% EgHyRW+iLǞ~REeͩODdí5uWeC+,ވ#F$ {ZV)yyj G#D :{.{l7PwQVL10n9,^Ỹ8̶X '!7H =[oڗDMݍ (@
P"
uʅ'tPR|]5+b\V+$ʝ_!b6Ajy2rE
P! CE WM gN#l6_^輱wmNG">V3+*!N
Pp| 矷jA{kF& 2SBa ߇O/~X[0۪$,{{[eo?QmjԔ9Յf M`Mx"3f?~o '
]-;&քGLr:AXr)Y:bO w[f (@
PP4Ӆ%8Qҳ
U4
7>W~W%aP
PpM`nrIgqAg$D{9ҍY{հn?SO2Jc{~Lpʲʯ>D "S'cQ RECiBU"TiCCsA-U#H%|Ih.`߱0ȁӰ^8}2U8NoRl8-51(=F~Õ/?S (@
<>o nl+ ;e%aChֈ;f1ہk5:1$"8Ś.4w+]4yaqmX[\hnщEQ(ھ ).b0jnMɎQ:W~Ki9%NKBx0(Z+e9We(rpb ]uסtm!.ҩAL'D+˄qQ>vWoܜvH{D>y76&b E{Yʔ;VȄ|$ǮEh E^ķ@5ա+m˕_VHQ5WI
ޣ Ge@X.}N =2ek±8ރk7m/(PQr,{ō[rXrXuXcG[qV;6~ytoϦjnTV[E#;5kFS}}i.[B6
Wޒ}Y/ɺ.zЯGJS7mQ?a5WO_Wܖ/k[91a(q#xcAGX>Ѭy2Z֯nw>GoΐQ~>nM#
dhj,NAS#'OtK <.
&>Gn.BP c>(swm'Ug@QDD4)Cj9N_Z?9VnZ&DvKWB6*0ߊ*g9{q83_崢[ۨ$ [pT Zzs4VF'Wl6: \D
P (
i%3&1W)n"J
:@F-to{oWΝz چ <AH7}59XR q|<_w! ۳w4EͰ9]ؽg>w4+ z.؍ DC ڇޙ[W/ŜZ<cQt\Ɨ }ᢍ%Q!sculr+
, O :4LفqKMqO^
@/q+p2y{WI҆O< E~6 DqY rY{c
`Ҷ=mϭ'DC1*NSʍ@^5㦆:hvQySL=
e# pM_!!~7n1Z6ϕ܁kg?Z*sv ޥ(;4n6 CO& >zse;q;Vu\,Jawlg(o *eC)]|Gˍ
x#98z@_Ucz?S_aOU SU7}z;=c<Yf5~ct?ZX6oi}"\^J_;;c%Kv߃U d)!i7?N:>z4tuQ۵X({
i<dg jOk]rljzwb{i w.7)INܽe,IDBpTV{{ޥHeEa&S{M<9NdWڞ_k _':֨HiIyR}I{MEP|
OXn>vi-)@
P V]t3j'+yMMMoR
)FCPjٛ?w4ҙ7O"mpqZJEEi3)zPƽ|gW̱hs +b_u#fHIf˯[
𭗿۷l8KG
P/ൗLD E~X47^oSe |iYr (gm#iDl;SNPtOߤ|t.- Nrˬ餍?=j̡g1XfH'o.7sϱ_stZ\ 7ˁt vL9 K*u&L=
[W®pp_w7YKH4@4kh$[Z7RY+g~SDzHMvnwO+9ܰ~뎛6}G罝qq\ΜA8Gݒf7g)" _nR]zX͢foh̟7M߿]z:jK.PVIכOIS ݕzjGv皟6Uttt7AF}[m<m ywҋ:ބ*wi"1<&>}mzYɇU=N#)ҳݎ~Vg~q"Ş^#Fq3NZ0'=z
Sk
!-q[yw;U)!)@
P W7=$vnbq12<%;R|/ݥ9j{w?^%MQRf *ĝyʢ QwR}Pjw`^)zT:Ǯ
(17l*|z{xMqj$Z X!: C <ԌS
Z=[M(iLĖ=;Pl qNZ%&WA A'٘ zR"(@7`׳b D4ւk/^\L M[EOE^ .4JW*c
cMza %;a9\la.oi!%9} ΊÈZ 5
&.r^ *ke{F4qgA<DZ~B. Ut +<MwS_yG.zHiLWˣLuk|z<d:;՝Í7⢔hq r$(w7?hoK)J3[{M=r
07fxg~9 ePޅҋ_}y
lQ>H4;ylKR/{o5: <>[E1כMQҪ!A*Gr6FWiT $#[TsӔrzcCZLؼIt˥F\r:
WsnvbXϣ{X&up16[V3˻^w+gf[:1 7Q/J"~@Xc67 MKܯEyv]}g0扛$n:]'u\ޭR~'SsDmMQ4bi Vq/ j4
p2UQH>
wGfimR:5Rs9aM&/ǥP؉W_ 5w 989_ ;=_Sch
P (@ n մT4I h[m(,4.¬mܣ uvϪ
'4
~u7Q(<e|;T @ IDATR4ﾉ@-8I ByVV:{h2-ŝ pG^Sय़b)p䊆Je w !ThSJP}3t0Wbg17pEh3Ҿ.6ҩ{3q.*-HOPj\{ /
uW`_^TP
>M֤=,^bؽCahoL] h$-T}o}[\VAZ8Glogșu?W+{.㑚L v\R73"ߟ
k8s|pFr s @ tx܀fظDp]]Xi䣥$ X&k=oܫϽ۟5ϝlƳ? _柂|\mջPbR ĸts$h 3R
3Ci\=*>n5%~'gݔ}feo+ԟz/QolG f^1ʲ/&ZKˣ}\ʟ|Ttr"WxB v/,>xkoz;>DS =>ez,9I6֙~ Ѱ]t"-w\>,ͫ-Bȝn>E{ʗ%yD#C枒¤_͓˿GM曖IJw ߡ ;Y_~{H7M'ܯR;=_q (@
P75>`L߫Fru7=jrCQu4ԣ,v>~O5tJDcELeLeMw5tm"(dPWyHʕ+"zZ\ʆ/ԺZk[V%mg>į~ -s5 ğY wᄃ߳$9
P!h%[ޫ=OqU;wqoUK(
(HJGrv#1FmSVM
BjQ
EQXjyMXjaI/ oHq-M#FER?<W>ܖ~@jLQKbf(Y\4<oiS#Zwf1>=ӫ.hiCKKWrMMN8{ñz P-cHm.=OWgݔvzI/ӽ F:e[1.g\x<w|yKzr~~gx??FSΈH݊#8X.<$qsYѪ~ߏ]xFv:owry^[uӳNɳx\iq_Ϭ{. )iFc}ߡo9AQ @x8~U
P (@kZ `\ QY24X4K(W.f|{
RPb܈p 4x BB Al<D^s j :rJS zZ9j.p:DVӅ xoփ~twݺ9qW˖+)@6`zq<U:j\>SYnnMhk8nyQۦIR?7Q ]q.%fy k1ա{I;ɽ8Ĺ %qD#?={u]:[*S642| G]/iR%).Bݵŧy,&j;u\]j07Eol9SZ4N -)ai9u\8pʝTU8>4E2&l9#bHw?p'j7׳nzű^BN(_'1 jA6 _zU&]Wg{D/^Ǖ|def1#br|
D~.u: -ܯy
=@s Aסbܼ Qs%}9˵Zjgc|;XӒ՟ ]bTV%
O܇ód [Ąt_ʃsWg}=(@
PNJ)wbP"Ux.͇<+
u31t*;2*\p^z ލɕ՜Ɖh ۩4#5S<+BL..h5D\)P X3?x [\TQ%#qxfs1Zg;ogֶ3~浱W>} Ŗ z<u<Yg'ԧo9"?#?N>C)P Gcq\ 4bcU0?8Ő=m| -\yk5/7w+wݼcapW<J^XgU=X Ǘ/݊Dn0ӈ˼!{ 7"CZxkM5n;}֝q|ir|jk]lF5x)i<ia<n ZθR.5^|ޚ5ړ6j͇SyacKoxÐ8|ӍوSI+"1%C,{R:2<(@
PpUￓpvU `ճoۀ =(oĝ V4 j5RӝEcSScCYE#3|Uj+ ϶@)?^6*BJr"RNbC(Цɫ4QpX
!VJv(xC[FwU2gJ$D?Y.
=Y#] 2U60p ͈X%/ L#]xdaAP:,bʼ~xVW#RϝBO0؆
@ɢyk|gG6?]LͰ6: <_ݪV?»ϢzwZ<ĝ;Y2jH{4$gej$n $L=/Sh" OF28'nBD;VTw1~q[kukr1 n
Bߧ.a=Z:,wut/S=@߯Q`, (@
<b'zq26)HQ.ꤿ};9wpf\T=[4u\ƅ+lHm=']/RGϸH4udݻS%M"Cҳr PczƏm;жs K
8&`9' uH`)
qmD^ eޟszr.v q)21 @szWa-ǨWw7~Auىj^k<?E~,@w[FC&oGzY rj;
cn PApm]ڋ|1V/>Bo O𝌊?/y6ڒ[}~us4l)=3&;5JUBwaNFH$>Dv
Doړ"E~ 2NS)Ƭ 7PFgN3m'#~s{7u'˥ɿWl̬r{x1[ =4 $7o|dY=$ċk ,cpܟvJ<]蕇3ζ vyZ)?)@
PoSrr%\w_A}C6^zqڨ\Wo5M~횉J'Zhi# =Y&/_]Xn7 //FZNò$ݮhq|zX\ߨ (@
^@GiAFv2/W8wئJ86OZ3lFQ@"FC-ۚ`h[dCn.5]m,^~F%%s)j2O6q[ Ky^&#urggKIA!Cթ
CCOQiH0ݮNFgpR:
byjZZZ #铧0hʘ_^ گvvzx0y2_ %>U͟ *.O| gU*^DšElŵ WpuXi/zl=݂"e>K|y;+^f|Bɩ
WDJ=lRZH3W!6I 4VC'Đb}Խ[^dOLwی}8|T]8utypFը : (@
PpX?Dvkk͙FF':Qw[{7NWjH-X+4DZ,CnߋJމg@~H -˟~_3˴JόOj8S]Gc^Fq2'7
Pmv5öCؿY9*b7]i92{;,bg+8xph UjwލK?^}(ͰΗsj}K(Kʟ
$寠4WIW_VA|mQYzN؎[MũmͬU]:m= g?ǫuq=M6$gO7j5s#X"L` KosT f܋giZexl:_Wu,~ϓj"ugܫKcsW|X0l>_HᳶEsvz p
,!sP&H{۠9\6u>-;{Q])bt{ڒsz5x7dDmo xMՠitf'3U 6!(>+W%4
Q5wpyukWg}zQ (@R`ٛVPo 4^jP=B.DO
q9x~CUf>.
%;7Cj˪y $(?Sf\FS(BSTxEs`ua)u3r{ N4v3}M Ev~ !Ep}sJ1 5h )@.vVlA鱿AT9u 8j#2
6#-> _*IS+!V%G&8<s
nQGCGmǎCRi0vI5"UP/ hyXǫxb&XW[͘mF%aQB-=07؊QjY4
k1"gD~YP R4Rjih?"'M)sMxwJj}b&}ݖA%2_ U L\ eYJ .WO<_vz9
kкYOdhϓaw\iqJѼ[5Qyd֫^>wvqVؿkjP,Ry8jqE#=yF
!H;9{|ˍ43t~mooΧ9щh=Xn:s k ͒r^BO} -T EGDa!aHHBnQՍ W/ݜ5O~)WaMgk)0?[H ~b,ABoWo鰕'iu#Z'QgVCZ< (@
<P QЎ]F3k,w C$t 7oA^s(?40XI{aZ>O?9מCa2dru:]͉t9G
g(xk|`i1u5 ֭4(:wv 8C
xNg?}FyƸ mSw*gu!N`w!Mme M>%V:J jևˍvǥŮ
/"iݢܚ)Kv9ʧnmՏX8sR Q^b8T>TW\ǫ])~|hO!" EymҪNѫe6i[iZ҇Ѽ Vy0.;|&bczx0.UeU/u֙뮛zcotią:WΓx0
l + vꕛ_=e+:$| '
h57ՂN~fiUnL 9>W y7a 2M@;jۈ^d7RD/j7w\n윇zy %ù^!EKo6Z Wܬ!t3 +ӥp]G{ĚW_ƶlscxxt{%(M7uKb`,PnTۂ?@M _J~˔[ U (@
P~+fs65kFD/Q׀[5Gs0 y~=ĖL}mSP 7 S9(!, Mm(Gfհno3?p ?obMvў&-wAfՔwW&0P;}kJLﮆh@ S'
PYʺՃz\_qҒ i=9҇ӗjmωGmC0D=|d jW YNwڬ<'#bi3ojy >9^ooQR2:i)߂{EY-=3_UbPҬ l*[ ,4Zs-ߋ ymL}|xza- dg~1_<Ko]R ?
]hFDvM|Ufyv\<oݲՖiuƶnb:2WY}O52JDMV8N\ݯJһKW
Ǖ]nz+8JO|h+i4M >\ol?1'k^B}YgN[o+o;!{Ǽ4oh>em']?s\:> _RNӸ$hպh䴳5Zsol\e8GF.K
Nbomw_\vf6.<7ʽb=Y{h;^#GS.j'.shm`xuz~CLb-yd;Lb Ji3sKVswS (@
S{ f
ws#5m7Ҍ\;9q;,:*EbȮIbf>ں]ʝJDF1ϬN#h^9{st D'O 7[.tCtdbarA8)"zӋW." c}hi" e|;UhĉǬ{Q"CkxH H)!; =>q# 5dlB^]}g 4ρ TQ-yjGvzHLJvfzӋG$AqϑRЋ^>wJ|LGFaDWqGКELnqzrs 2b%HzdoB\L81jcc7;NʘG[B-L0ȣ(<;, p?^\-*5]{3_)@
P,)7DdUFmdNf=IB8x @x9=pK`-j8p W-=kYқq}ö礏bIvPgj=y` د.vrz ?k/Yɨ|Z9>ӈ
^A\./k]2ׇ⥛ =fq_L1WxfF: _|s (@
PcPg\A
P (@
P_
`P<S6A]V Q([70aHۄMij<sV]
P (@
jw1 (AAjCVjڜK.1w>Nk ۫OVy_ŲAXr![KB
P (@
m1 (p}M{wN<M pgl'{w?Nk ۫OVW -[h1vẝg
P (@
}1 (=7qN8Q Xr|Y ۅZ.U_yȄt$&barAZ:O " (@
PPiQG
P (@
P[^(@
P ( A9 f(@
P (@
P (@
P$)S7}P (@
P (@
P (@
P#0? gf}hdʜz
L{4w[!}T)@
P (@
P (@
P
>|EERB<ffgn+F:xf
h
uϴ(@
P (@
P (@
P ,(FF-7Gx9E碗z =۷ܚO
r}. (@
P (@
P ('# !t:]OCt|RM((@
P (@
P (@
PlgL`ǹgCw (@Csr (@
P (@
P X`M Y (@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
3 ',"(@
P (@
P (
-̀#{bf)@
P (@
P (@
P {\$A
<S, (@
P (@
P Z_O=B ko" =ã9f
uZ
Sca8w(@
P (@
P (8
L+X4D!x55IuãcXXXͻ?-?=a^(@
P (@
P (@
P tq1X6 ,l^}a#$$Xаbl[P (@
P (@
P (@
(ɍt 7|I:iXN |1 (@
P (@
P (@
P
HϤYj$웞1
)
u?
P (@
P (@
P (ԓNˣ )
?
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P A(@
P (@
P (@
P ('±'ݎß"`:KT"<# (@
P (@
P (@
P {y_J,v
_?颿d (֑M\S}wS>-R<~ro?.~ao{j := "06)`3 y:t: NrC
P (@
P< "YRxt
Bh<G9aݔ`n >~Y0EGm=KY)Dc~s▃ac4cH'60 eQ9yg.)@_ wagZ!88ss3C۽&|]nQ /tĉ2=lr'}?En~a@/{{vr[X/-8 $iUW/V
9;X:h}hq\4ZϾN*3@
P (@
PUk h>yƣ(x4,&'oTܦkj3 Yp).1#M4u>.&HgBF w#t<:Ƨ7{lr89=mY6 lxp#L%.J@OaCZ&l/ms'Q}_ˀ[*'͙;(\Yoٍ`t8wh{`?9Z>G[ͪ0SCI~v]aojŴ<W"煗'G AK-W
_|uxm`ֱ`Ĉ^zoaJuE (@
P (wo<?~X:עsӥQy}W#r3S-4cu!5~Jϡf?4f:Cdt,RM%=\;'BlBhۈ(@
,#Sw'f8H'5!ݘ^
X߈S ˺a5 g _$Ǚ.χu|nZIJV~ ~ۖ n5δT}K߱ߪnw?#F_0YeGs#i6ҍwZLA榭؞(oT<Kzu:}mQ8O
P (@
P7U6ڦNٹ
ucvD rtG
p%8QsNlm4)KтR₸E\wl{nʅ
xKGaON)I7vEҍqQ >>t|nz2qؘєzvttt9SZY3-Yjbζ{U+O}V̔g"gFݴTm;6!I 1ނ~ڐV#H f#O45) (@
P (@
HgUݾc ;wbkim*6]-8R I1=
En}4FwKˊsr[<ʀ~|Ҵ]ȵ5Q(^hH=N4`m5h۱/Eʼn'j0Cs,݂ð0z _߱S;:1X/ *-#Ƨ" E">̌u[/C?Jk/"]"2%<n0߁+[-_ZN P]" 135JBq (*kMZ]Ez}T| a]0֬'Y uV^8$ɞю!/ڈEq~\/Ώ}hYgۀhr$J `#ىt4Txo'.lH#bDxNHi2E2-EW8)SV$F!l}5mv4ř GT`e!ވɅ&#+G%&iun+' \[ tꏣst;S <YW0LFN70^{;Ž\E}3 c鸼qzhp!9 ['x3 Z$o^!6VqܻciSC<dgIV)Y s4nJmSy$"ӭh+C \ (@
P (ڿ½;h߅Bi&A'dgˇDۖTy_IS R+gjKQR(
d>&GYzi;__Ļ_,5ͦn?Ԝ2<Ub|_V$ը-o,+T42
u9x?iWTo "Rw! ۳w4EwaZck L-KEte.M EGe|y
FKp#BPŵn5rpA`Rul9\lTj(2ϊJ3 v[vsCay$ošKS Q"9.7(q 9p@ҢK*|xJx+rf9W
Ĺ?K8+}sCFr 䖂lV-WɯX[.{vmUa|l0Yflُ /N:M I8?=Ͼ= `tSRYGvR=Q7a[shxvT%m%\}qڐ ؋ j$'Uo7n]ٻ|o_e'$ 4$&9IzHtrN{{= wݻκYSrt8(*2H Lg諾kW(
(vL*Hy >~4!1 *6 *Ue2ehKp_ğn?9mA*Sb `kF:QE,&&jn뷵{ (@
P (~Um~:`.jeٙklGZ+ [GIsR+ CouGe OҀas/a?t >|[?Hg)ƀe/WѪӭ` dlxIS)W dKkI) [G1o lTt]:A:Kux:6?xU I
rWvᵷڟ3
P`Z.BOAJuHaל,4{~r:k:A:kD{rg~؝T_?Hg 2tR\g}A3tvFcӾwgHۂ˳cR,Nx˾ co}]c=xnnN.*<M^4EK,ye/6K:j{]waX-:viȻA:K]-ލZ#Gs V {t##߯RyxoR9K+z (oFdv> 4JuU:) ScWZG
P (@
P
Z6\݈J/Eґtɲ} nSi RM b!bY[w-F qfW֬O
KA 'O_j ,ݼ[-@T`W= 4-jת) K7bok(ml~AΫ>( |:. Qr
;݊*]v
UWqH&ʶ`vUB 6ܴ
.߀J Vܷ3/Q&qq(*߄m;
{ ^H?)iKY͌JQwrZC
, m }5Zfq`An!'mh6mD<2#"T/1ru&nScb QR^QFؾ2M.ogWFfSLY\r,-Vr G4/9k \H.5fan(7ΈhyR*O^ժFd<e[h&|MΖsQ4YĴ{BLqQ˵[_UpGuUL n|8vw +7&:m!X('u\ Tl*1J8uK 4)((GwtZ=L jkpw9wi˖R[X5&I _T߉Z #;}~18rlp,ޛ%ZNY(OԜ>ԢxoE,jcVD9 xl.zV^ynCdMLŮ_i )@
P (@
P`qVN0Vydƹ-yuqg S~}\ &44ݤmH) L* 7}i8zg!hnzb@[߉@Y{5b)eNvn&po?{u}=)yo->A4(YO+tqEꤏbk۴5Ws?`Ped ֗^Ax OP퇹Zճ3w|~3}[T?coM
vX_hWVnA:q]փEhBIt0:i=%=u EYEWsSSM.R,` &T RHl ~[x-S_u]!:(ymnRCUgPp%@eAAuX_# 孯 _|t睍8}`u:u.u3 J& [_Od uAqr0N+5Yz?h$]#U:Λ?Tף fLe +MGU hH `o)5=I9س=z=> lٺ"U_Z5H5<\ֈ2Nmmg]hqHk ~~_uw9wٚ,yהk !fuN cȓ.4 ٙ"PWQΩ\:GuuANۇHc?soK0u /jJ*ԆYw3t88DZز-px(E[?+G
P (@
P k2w ^@X*$s[yJ"=PU{OfHGO VL(75e g P hZImġlKK߯E<㐙j&%b i\;Z?MHAi(8 )vHrV4#ՄҎ} Ԍ'mmMVY}s[ ^QqbyIQblc;4At6SҥaY(@~Vi\!w> TRiwk-u mi 5A:tg%0딌))bL FFTeySǪ'ur@/. [59 w>scSZ2P m._XJ ) zPz d, .SIcC$'_͝ c;e# nihGXWQ"FI+ii}sM'9g)W+ Jq4E9Mg_\7벮Jp@~v Nj`Mڏ?uǘ5"PwoȆQ}KXsr-a @ IDAT_įWcP
dDY@E 8 t8;4O)@
P (@
P`?_u.[~=4: Ԓ~I|_.*,51VnHTffZ{K]uN0pV'EbmFf͒µB}lƤu~ uS k"M 7^aT)sRzطퟚWKhnoߘR/hknGWw7Za3ُe#
M=}
P@fC wNoz ٖ9 z4l:""А (4A!XarƳ>1:lu [E.R ?#,Ldb$#j? ][m}ݽfZq2"`7uL$
] ^i;s gIuLLnQQm3AǭGs<(= u#`:gkCli\` j]DM)ZzϵGj_O: Rǹo {m=@%2?~'{Kg;Z[gNuuzf/{,m;VF%"6$`0 <sv:J Y,v-s
P (@
PX|hˣ/㻱՚: Q"H';=߭A}}刊 Xh%}*61N`ÍMb2['_- ~-
c
76Td`SGEӦ(S:
H_9vɏ,[LT<Iҹ eR\-&EMJԀ 2PՌq9uBf.hl11R˲
=WvQT
KslRgq8:?FG4QI}ѮQj />֬qqs&5ڔy٦ u3:>hN2 !1vg=ca:$ ܵǓp'OźsR 6;O1W/ ͯS )]=z?ܽg/u'q,a%+sF#)-S u nKAfWιآ \ \ly"/"6 EcKY)-n'Կ 1k]~XeFcOabׯT (@
P (@x,?~ӟ`u<Fuz%%wJ~\nC62t1YNQt3oסF;[ߖ[gM(SB@m&۴檼a%InDG͜&IRk>GbArR RbYHq*hǿ>fO+a>
P wSGv*1.<m )3 ց+m@ O&HqW[1u2~qs.t}2s}=,
#)fdlm tGάbAŪ lU1:źs1JN E(w7bFj i }/ N ϡ4'b$dR}Ј5[F>ݔ'3tr%8~V}2Ҥ`vb
2EրlkωrHNGP'c(@
P (@
P/>9b45j'QtsO˾ =Xi]jde%c*} øW#FqvEN@6g-"oB2BnUkDcҪ4!CC^!F Jo}CBB2"㢡75149Smcsyn'FP-2.]D˓&;볬WPh֬7 ]NfOlQ
ɝhӸʴ:j/ g79G
;kGH :3ʘUjީX?#'>O9r8Ěg~GBQ#u2i-JpAl:{~bfi\LDN^ϥ zYgzf [qf֠/ qc+W:G<G3 V 6wGVƤ"%)9(ȰƭCam謱h)~iI brYL7|f9[ ߶"F2(tMJ<-T4%bzy (@
P [ (.??XsQhAbv(
hؗP|R mPހ#;`) us,LJvu2EjM5[\"/C%&>Pq2`#*g
6jL)43kwZ[&=߶_Yic 8oqI-"&m w(@P^`N{ ץ`vڳ:1HĊufE:2+ E5#?'vB}lECHʲriݤ|A[mUmVD$ ijQ- X xjzq'ԠYwd9gK{}:I7SΡ ʈ֧s/*œU'zץ3ｅm]/~ A X1Up}m5⫃b
D7B
:]5SsU-[T1ۃ.eW<.vp (@
P K@ޖGĢ<O mY $>A1H_]k\~]ѳlDöBd\L=ݩn@EF<i =ޚM7hMM-n Q/ut!9 ,GIφ,kIOflxvךQ*6Xð}NSq4.VJu͚Y2X/_w w1gt]e/bK^Q}$.vIV`r
Ҡ[ʟǦ 1n7*Zu1n0*tvVL>Y#(߳ =M緺dJԜm(ϰ| t3;qQ[XbX˲
77H?(v|QߚbD6+gqU^1D͝S2pվҽ?zV bONXh~S3zq :K,6)s7^L8,eu?uAYקs'X oy
۲,ˤ2w5}:"¦bdHs-"/`z琈}o>r8yc_t{Yr_z,l{6!W20 MMHˑ.{0EgNy6߱j=ŮJ
P (@
PSebeUh2#{_[ܵttaHimQuS45u!:,݅[."8܍5(B2MﭮC:Wor) Uh F@pr6"Mw7>Dk!a,.n yjth =S+Ï7PӦuu+qz f11F5o K7QoD*d<ڇ٩XmK&#%`@N:'(@/SWlpƯFtk#>s
W!P|$ }{'B ]uŹjlҊ1Rc %yր75 YvTFuȗCw'8 #
~ =;7Ecb$ɍE7Mr+oGUpʵ:%b;qkՙMQp?Vðو
cxvR wb|hn:mڟ1[ws}:7i?U^Qҏzfc&'iꛊow7g#Kj;N
rқW!E:RxSSf/ =,DKUn
7P٪Nlln֣0gKb 5 "(Pwy~aܡ (@
P (@X j'Ӹ!b9ƕ+1x hUXl^7
[@ pބ
76,{Dz_-MSgB~Y5y4|q1ك -)ZV݈ƤcM7'!mq֟QX飑:DdIlݮU=9=ր[ ֗?3vU_4v!a3<\^ufV ͅl +'cd7jU7`:K&c
J*45'E9= * &@3:yC@' ;;&Gvfdۥ< N7k>9츷m]rl[R
v5{8r,"^نTɈ瑯Izȶ(pKwd !<!5q;`4t3=<KXtsO| Dko)km[֨Y\{яgǵ
w/.]FZk`>ďCiw51ɭ6KP
*?ط:ڈ\-Hmf(:q\.vM4|:=q[yjy\[g (@
P ("lzgj. _e+m3 ߖniuwѨ.c1ڻn圚& VsbVm1*MZF666Eڮ[TƁu!Ǯ[*M䙧sT<'Mucn Sj MI3-ۤBnFo-̙Z4K\mQh6k_ = ԉmϧF/(@ۅe}ͨ<-~ %EG1|vZ ߙŇoȟNԤ;gqmt,ݍo`Y./6w6qPeGv9;.z7ڦ Rtt;W*6*rZ? *apg}7_sL)4tjH!K._)kN ?ggIn:Kj,ӹKk3/.~_4I~: W*> 8|ܨoG|_ו-f/R)u?~-F"K_l#}z 1i̭ut<% iS?94(@
P (@
P`O=}WE"!L<v<gLF~j&" A+V`܃1-u^{k8` Hfe"T %1ӊ A<'~^=7!;q0&Bbܣ.)r354!,<lI]IRjV>
С\^QRxoetF_Y뤌t1`Xo;ZzG8HDNbZ7& ^-04'>O/F8XBB-eɿ F7Z*wl֢?w6:Ilcz`}u䣯킼u~/p7Z:]7GKD4Gx 䤿z Ĥ %QW4fH1#Henjs1*$QS JRw\#(@
P (@
-0:2
Rƕ+G~VrG~!?elp'47sJ=i;N8v@;jď[kcgEo5UV]DPSp ^Vksf sXuJuksޒNgΛ鍚і-oAݸ>=6ZN[m? _#f؇{C ~i`MqG'Y-~<P]5H.v_8sR (@
P Eyae (@
P+[wto!K (@
P (@
P (#KZ5^ۙW` yG(@
<g?IhHw-qi6 (@
P (@
,y[[քk&$ lXY(@hƍ;ǡ.n,[GY?߫:O xbGwr)<M
P (@
P |.)h -k(@
8tFB` XSp
$wӹQP (@
P (@
̣ uˢ)@
P (@
P (@
P G~A .C (@
P (@
P (@
PKS`2Kk (@
P (@
P (@
P&'ƄO-Yl-96S_:9(@
P (@
P (@
PSǏ15=@`tliڅ<!D0`rLLNb|g] (@
P (@
P (@
P,0-tX)낂Vss+^ Oԗ Q7{ E 7;sQe (@
P (@
P ? GwO/BCBdQMLLBtuMX)(@
P (@
P (@
PXȺѥ}zz
Paa>w(@
P (@
P (@
,q@|l
P>/D b(
P (@
P (@
P~ &P (@
P (@
P (@
P``
P (@
P (@
P (@` @
P (@
P (@
P ( 0Pr^0(@
P (@
P (@
P?0Pwm (@
P (@
P (@
Px{n9/ (@
P (@
P (@
P 6P (@
P (@
P (@
<s =sL
P (@
P (@
P ( ]`(@
P (@
P (@
P 9ꞹ[ (@
P (@
P (@
P@h@
Pٙ'x (@
P (@
P 54-pOu Qc^!(@
P (@
P (@
P
pD 6 ( (@
P (@
PB 8kٲe
BPP /_a Bx]u^
P # 0
P (@
P (@
PVёQ] [eDP`]_SSSmO:l (@
P (@
P (@
P4.:*FG f[M }=}ݤYgnV"& (@
P (@
P (@
PPBCB ɓ'ʩE zX9X'M`.~
P (@
P (@
P (@w5mtl̯tR}#:u1Pw (@
P (@
P (@
P~(O#<4T ] (@
P (@
P (@
P y, (@
P (@
P (@
PV:o (@
P (@
P (@
P XV #P (@
P (@
P (@
P@O`+/ _{]?ut7
P (@
P (@
P (@gF#ꞙ[ (@
P (@
P (@
P +kTOB8PB"H >j*/i@/Q (@
P (@
P (@
P` ,p.+#b d |vӔ<A
ݎ^XI\lwg)@
P (@
P (@
P G`i}:`J#$XL3aFd$@u[[* ğΛC|
)1TO4b(@
P (@
P (@
P":{o [=`ىL)Įw Y [iK
A`|jZM==;߬z; (@
P (@
P (@_ ܍3gW,ݴ 9~Wanۏ )VgA84O.HfD_k5Z(,](c+ J5"$ё"` ٝ%ؼ~
b b4zDs"S2:2L:&՚Ȕ\䯉`kz;rI-ն3u#56A\_oDj|¬e߫EUdm{goQjT_ :&4DwuCx!\"cI1ۉګm /cr '} n:y7D\K[*\WzѬsS
C胰{I%p (@
P (@
P (@
PW1Jqy2
acrZp%)Cv!@]|n^]4M%uŎrܽtNw]941UQ8s= {pZC Pj's`Ɯik/oEqZQz \JלBYf W(ƅCxO&mQTbrTÁC4Fuy^wy<wO=g:SJiޱloWWq%8wkEsր24ݛ2l-c_4ٵ{R}(مKNɧd+Fd}c(CGRlۃݡ3h" Q 3jN\Fy> (@
P (@
P (@gSѯֶvH?OT6#ΝuK-݇k )
X[iϙ o ,gٛ [}>iL
;bŎ!!|}zB[~~y6f?[ȓרiR
*>>U s}{goK# MCGM$O _v
ɨx0_Cle gux1t[ۨ)ap)O&~ΫXk| c`GJ
f4xض\{Ud[e\ (@
P (@
P (@
P.6Pg
upaܭLaTLg:w 'O_miI1dؚ,'ɩ{8pIۈ
m O_ąvċDP3Zvnp5ܪ/OY_Z-ϗ!EdhG.jԆ[p_qf?bKJeOno/:d
u
uk*u )5 U\ Cn管#DfL|HGU[P־kx "Dl/\mIPMo/S!bfQMk_n8_GD00Bv[lpZr5E困:4*9~MVSZTԝd=
P (@
P (@
PxVN/sȌsZ<: g\ FUd)zeA4 ՚w!M[Oy
: ?W6X qE CaQ.AnwD?Mc~gؙNy;1>H՞Q45WOc<:g*r]8Oi7͕'`2Hq(& :5^ǁb
ys(So]];|皽m 2*+ |3\GkC(!器9>-N6*5&L~c釡a=r OP2`b SVڂ
7Έ Ay(g,I"rcվn:+֗AWsR+(@
P (@
P (@
P@#0t
S.绎enta Y@*Du!5brr+[*ps#nԧN}nCffCu5Ȧf;V@^B
6)E2V[G)g7+/?w:zRVy;E}7O:7:lzڧﯯStsg ..+QkE9<ۣo}k\LWlm0ừPr|(.!^<oktjnUB8,i9ͦ i.PE#؎MAT);& 0aY=}
P (@
P (@
PKP.Sr{ʮxNMN-'3rfk'g 2M/)'pe>.t\Vv+Qqk̩*"-v 4gS̘D#4(A
]M2]m Z,؇zVs9;E:ǖ0lhzpnCᩩqvG wmKG*Żvtuw:kP.w*y
P (@
P (@
Px! yIn]|R .OצFzpWьq>:IeMM)% 1Q*viw8߃>HVFK:twz5( ^ͷjkg-J26-1 ZoNN[ M+o/#Xp6 =ϯR (@
P (@
P? <Vn ~w?O:5es[Z[㖥J&Wk)iqu]&〦ш[N#d{!ԭ`1+% T2ܽҕ {:yllJͽ D@$2 s/k</ޮvi#wS^`@&fMի}{(_81-E"{CGUML
P (@
P (@
P *>9bmimz4JN{i_@]o:nK!@UϡM# %6>[`8E|ȫV" :\ [<^8[3Dbxiu\s^_OOY"ׯ?c*_>Gr?}n}NDZsu|#~-2.]|! ks>:j4ť7|tJI| (@
P (@
P (@
J+Ĩ C~0%fc7<<*
4 (-Xn"H)&o`]h v}-ߵÄ^dJ6-%yJMLFpĺt]] n dl+@7U N|9$? yoo#buoOjc27'[|J2R|Ͱl&6hD|\ {LUy>-^1'b}P (@
P (@
P <3ⓃGre&&'џ4A:ÌGx!WϤ㕝enlH uy JLM:_*ږcMƔvlb\!vm)TR,[iۈ<;EĆt(ҭMMhk=3m>>}ye w b ?o~ ct+?f ɏtNlO(@
P (@
P (@
Pv˂̰
M|q[<yDTZ:D /RyS&|
T@K$`
ͽBΆRaܼVeuq1YDivfCC"P:kU=-b<PM X=$ܨC4¢SQiHo"=[z]ق旋!2?´KĖ2r }QZq?&W1YJE[>k#5 2x}c54ܧ#p&Mݘ]̵L:N[یضbvY%#%` M'mG
P (@
P (@
PE`yAqƕ+1x Dnϒ{^@f\6Kv 8r w C kuTg.v?#`kuRdRX(g
7c yfn~uTjlޡDfiwdEpy6يO~2T;Qu-%T1Ǯ& ;D irDP`iݿ͗. @s=v9q2
@S "Pg3yddblY^W% ӼVB`7fx8RE֙Yy (@
P (@
P (T`YXMOLUfYJ, ]4tb]wA _>fP75|o\mLmz 8pN{Xߎ
~{ w%֭jZ\8q B4m|%# .<7h:kԝM骩bBDՂ5][{]*ֱOw~b+zO_W6Ӷ.9.ڦV+㙿|OTgmH9>>^Ϙk <f\iGӝ Zͯĵ,m^.eaN|A n55 )| (@
P (@
P (@9 ,7D95R^eoUz{& 9c2S0V
mEt ' >ġ$N[ oΰ'+SFB)I𘚞1La]cMhuݼ9<?I竽sCvA u
S`Qq8 14C;^M|,5s`@_[*`LL)چGg}yL@nv aa l (@
P (@
P < sJ+G~VrG~!?elp'47sJ=i;N6 ڵFů߇_+$ﺅȌBeA:l!I4]c4#YMgt@ n (@
P (@
P (@
̿cwRI%&w#(αM%5lc L>S3Mx (@
P (@
P (4
(#k51Ps 'O yYCr ݭ {(@919(@
P (@
P (@
PKY:'wAvX:ff*snީSGHLB
P (@
P (@
PXʚrK>o6u.H[/3(L<z+G1-c.4t7y- (@
P (@
P (@
8`Ι渹 z6
P (@
P (@
P| <:*zI|I (@
P (@
P (@
PF`2KkQe? [E
P (@
P (@
P R`rrJnWXhߵoٲe kb| N}( (@
P (@
P (@
PN ?4 ѱ1i À119 ҟuQ (@
P (@
P (@
̳=7cUT
Z15έxi<YS_rD-SSXER (@
P (@
Pxx =
A``^E9611 iRI@ -J7a (@
P (@
P (@
P`i H#FFGE,r[)@
khROܡ (@
P (@
P (# ͧ3u˲)@
P}ɢ(@
P (@
P (@
r?h@
P (@
P (@
P (@gNg)@
P (@
P (@
P A: l(@
P (@
P (@
P3'@3wy (@
P (@
P (@
P @? (@
P (@
P (@
P``
P (@
P (@
P (@` @
P (@
P (@
P ( 0Pr^0(@
P (@
P (@
P?0Pwm (@
P (@
P (@
Px{n9/ (@
P (@
P (@
P l(@
fgQ
P (@
P (@
P` 54-kXll4'0>1d\[2
(@
P (@
P (@
P!$t
P7cjj?\\4(@
<K5}uS (@
P (@
P@OLZKeH`Jb 4m7iT_xX-vfYGC
P (@
P (@
PcёQݼKiZhH B^<yD#$:iZN% (@
P (@
P (@
X5iM:i &id(V` u
7
P (@
P (@
P (@]:B͟Fiai80} G
P (@
P (@
P X
#Ԥ˓~[N}[OF
P (@
P (@
P <xG}?bL?̖dI爺%qH
P (@
P (@
P (@Mz(@
P (@
P (@
P uK6 (@
P (@
P (@
P` t"5N (@
P (@
P (@
P)>Spֺ1>u>ĜSQ8H^Sqx @D4bc"Plv^r1;(@
P (@
PN Kaer wė*-dR "uo__s+RITc?6$0=5ofa;)@
<I;ƮپO%?k볛w#b;G/Yvvg
P (@
P (`X@ 3 F \|{"Zf2 B洺k[D!/qRNY5]YjZᡔ!&/Z>ከxeH*f J)n1l- Ą O=+UF \ǡ/,RE;/H9KSGW(_ngߡUgG%gsQt2zg i @ IDAT4<i}s<uV;8k+ HXhXWN
P (@
P (F0dAFd&i~,H98a@jZ&dH~&d6IՎңئ,nhdĖnx} ݓ'sKtorJQĤt=KrnVcvZN8RپD
TԹkIbbS.tbӔ01
8PY_"ޣF$k Oi玮.jlBƮJ{y9Q[!=Y[< !Shzޚ=< su){6 O4ic :f (@
P (@#lٲ%{{[A ԡmȖGaD">9 0f KIg" ćJʮ.4鎺Sx(>HuK#=wק`Bh 0hB4Bsݦ%UH{@D
')_lAgG]i3%̮9kjmO'Sxȕ˝Ҟsz&Ps0<@Xw6Z4V- g|ӓvh.n%|8x$f (@
P (@
̋7_wA"&a*L5z}B{*&Tu@\39 vǢ/ V'ƪGѭ>s X;.zGf- }>=5йKE =Dʅ-p;[ }}ݝspz]۹q[ (@
P (t H(95 H9mn
5uynQqqzZHJŏ:eRsNmiD\-Pjr1͈\$GG"X`>4W_I[_#
R&VmJ!> XF9ϮH˴IPO5L4q80jnEcz!mDjRDxӍش~
b bPrt
(7dbu\;Z%6cc:Kp:NcW!;m%_,6rn qhUiXEIAVUcSk C^j Z:c"Ws:ol< D$!^,hIHEx* ({M@Na.Rc" #Q_U~^&K3wa{ :"_81g [&u]21 k2$E1=V\kUۮN99HY162Wt¿ F1zMj=ZcrV(.HGt}6-ѰG͢ 5V&#* C[ jѢ] >71"md BWIŲV%aMhxs}[um왋$o-E[eO1O9v8z;3rG!Cgk$U@X8PWYڲ")n:̭ } g<yI=C
P (@
PpC
qK>mmm_BI02))"Pf>5- RN)?IH kͶHAj%gBk$qxywҤb { >?qȷ V$ o'F![Sp[M6F^;#u"xQe.m5g
,d:fak ϸ+w+ {pZC P6W=KIV>Z4mK4d2<7 oWu%8wk3uv ͽT.bGj,am^g0d2J,9z$I.?jvy,ٻR_{%}`R/Z|~RNcL/Di^"'̨9qyXV ᓧN 65 fi翉W)3kٲq ج2b<ǭO ǹ>Tlfs{827b&p-PE
1" {wo fƶ[66wQz\9o،pz]4`2]D[˒aH N 5"0ls3t^XwcQbܻ~
m!m6%(q
v{^7xp%vbws\iEď
EnfPԝv*۟G}r[* >mK;.J'm;svԜD|(Sm뱥keD<~yڟ ]b:
P (@
PKWE
q: ~vw(S> >%V$)dfFJܷ>KKNǗqv(QJ÷tb
X[{p\-8]x)]& tl|I J:iJ^q<ckQMQz Y2wJcގ^Κ({ kN:0)Ƹm& Y/nH/ԍ;djHF?ūmH)ً 4րM/g7ZNͱ wd}*^ʭEj.46Xt@.*`c.VãOv]%1_7_k J+5mƫ˔cRn~ (<[{ b gbZvu1^IRA74D~zfqKw' ;w6 ͉x}w(H<3|? YZS8>Vώ)]`u%|av&YGnnC;z\1k:A:I*6vF;=ui?i϶[oSR (@
P xz?^ɬ ,:Ѯ֖@%$oO/3cipn^Fp.II"4MRԙ1;:V+.1) 'O_jtflͳ!&KJ Q
nu4t`24 b
KW{DI'WwVZkx -^h-7DX#75#6\Qno=ubFBl*/CqYm[-$\/ J?/WEdss] /[?sb
[G ?<~Zr)_g }eT)DC A6[CBa97SqA\ֺmxjp0ӏ`mυo['ݿŶ&;Z4d[`PLY%@%;Jq> N]Wj hW( iR4
JKxGy%W0bedt ;p4#Sn,ۊ\ȭe\u7l
U7q !JR* Ǥ"[n;b
O1[TIg
˳PQNcN3q|^Z1%bq
c Fgm8R*+|Uuuzg=8s {(R(Q%Re[llj|'qʵŹ)v/NqmHY)Eb;A @ QvrΞC=+ wy y,uoL^sz~obv Ǽ־ ]s%X454tRֿ@paxu_rD=7q!VܲyNY3z6.WY<-͇፸um4Ѻო3XkoZ kRٸJ' "9
!8)-D~&?wL y w. u9rb:l.
L! FyN4-ԈeSjr
DzGwzXRṆ9#ױ`~)%uyuɲwXRΟP/\tc3kZ]ڧV? o??;㦙ؖ!m B6:>}ڶ x^^|7b0[}|s{?~OcQ̃:-76T=KӯAKx?/V/?GB˴=t$'0_u= B*W;maq^ש?[̆UWd= zܼSdfY0{ԯ oO|^SۚGƺ[ho>!$Bbv>
9enmq>X к,
Mؼ`B'+5\c@gt@Esݰ
MÆ DG'vm~U~7ShR?t6Yٓk=NމwcSbfj1wi-onE{ňp&
O"$㳧dw;x͵Ft|6SXTw<ӗףJ]?c~<Р=~^8ísf6ZM qat#u#F Ŋ:SDKϒo6 xΝWv{%W8ۛvCź{`.}t!U9oml8/wݷ"zgM{N(V1n\o8A qDwk ^,xr[}| zC+q1Of u݇ }=ϡ'?' EJK>QXt(TF?k =j2TE!S]nyz\rOc35ʧLJ8d_ص=GӅr/TUV^Zq/[ ]?0D MSؐahXxq|ly3t;|ֵ'<,&ԬSTbfMl#ܼ}̙s<rr2jkm[u>K{ )}E:ӧڍ ^$7E Lw~E:!6l܈rHFg.#frtLߵm/-/mǼ~ 5~ v\JОRm,1Sْ!ڈg|Gj"vgѸ=X .2 M[#&"(R"5%^.'ksN6tiC̽yQT:Y}aѩT]"2/.ز{=~&NVhM{S)3{7vauժpr%jOߊw;"v[T;5yV G:v绛vbUl0m <5lq}w̼yf2">bC wka}Kmod?;s&e#@ A8c;9ϞX|3ݟo,$ D8? u(>b{ԙBe"a{p ˔Pd JYFpJaqd%> <a%U컺JTZ:]iUiɶ ЊG,_VL w_cvِSf#.!rs*V|.'{YJ.Y_Cp| ٌ#%1ݞN UQn鮉NCf6iEKhkr%F7庮k!ƝsJ+! cgCm1L_%X>7vzրͱ܅{T~ K1B+F <teU1U`-Y^cOC(K}:b!PSVbN- &,,4?/l 96YG6^EVeTͻ i期]dgG cޏ.B9 *0W,dd!#5iiHȓłƓ,ñ`i/_jc/ipo_vS&4ϛ;O D Ίvs8G ,A"/DSfW7uPw(<cWK _bgw,?
\z ]_S $3Zڭ ]hØxli'Nݰclg5t)/W Ni&^ qX+Sa/啥^0Ǵq7fс&X{%32?d,Gy)ĝl]ڳ-:dy/! v&z+|XъE*uNRMo. %e2#3 E;uv\'~۱0NI/eکv팉@1ʵy͡t=JOq>w-^+ǭYQ9u2 zаc76ɵ"<[l0z`3*L1r{.qk|Lo[4 -o#tOX3=t<WpMd8[CىǨbrp )-p<8 ZŅ櫶֑9(xc I> ?QD4 <e#}o, Th<:3&'Er\Y͕n&Y92_J2u|uZZdVW* WaRg0pv(L}U9Xr 8Ccu}I\w Gm0 `Ԕ wuõk`ĕDt4C j^ѕ/]^v(Sta% JBy#? 0YTH}o= %!.cYhֱ<q a~SR1݃^i7M W ݆])-VBq3= g0Rn~]Q.ODc*y,/E[eavF` K%{1(f枓 ptb:S&~4$IHHHHHH
xnD-Ou{F^FF 0 5qM.*E%hQyChnƬR^9~qљ
nG8DRZIV4JpW,+@N+ܳ b |crx}e6Ja]ɢiArU!˄Y ]rEi ˘,\˒[lr+!}M12sdfH8BkB ? ˦uS!Yء 0
V_>KiKE bB&093wN }6奎jTSc4yXp. 5rp <yTvow.Vq$̞*t-fpD=qF4x r \P"6NC-+ғ3.vI]J_tEH)mߐ هS:f|Тf~$
9>V#=']o& < t~G`a|$LO `糰@
X1[̟3Ř%7ՂaI#h>zd<[бh';RQ5iJ> ~.N dc{qɫzl ok*U.w, 0ocӌ~Dz1{Vvzڊy˶0|U] W[]5
c 7١/C~]2Z^eFY3Nd&.KWZ<'ÏIJ߇pY!7W kϕ<Ǭ{j^f¡;\L^
{<c.+6s 5deW9Y Ɯ"<@:/2S5}%{fxaQ1k C)jMuwIʲRKG?qev,g;9<z2+0שd2Jlfp<P^|e^}%PJc!9f Wdy=k415w<՞mVYfe{Q:Rx)W|)afEg6Gm w Nj >v=xhpx] fL"糧z}eM s +!'3M$@$@$@$@$@$@yL7yB"T ׄtxu4 u>~H ڥ 1@=8M#AePQĴkŪف߸Ś|)ރ=θ/،[v:b {Ͻݶ˩]o!VIl{ )կħ\ , _Q gg=8xȹˮY\gᾕbg)`9\q
n}]z l)m 8 p%Y=+\3\LogdF]}Ug9Kpj L9H[v " 7B4c
Y\ [/8涅v3GgW9V'?OgҥI؍\Sv`5˰ʮK> >ЃxX^ mI <M.@aA6Őٵl% 8fJzPYI"J ܰdp OfO͒|F`UeU2j8؈-kl73O@puxwXVyM/lL֟kUQRGh]
EpӜ@yXyR)(r:*|
, ߊ3t}8y } 8y $< E\#SZ~MHQMXb\lDkJ\c?x ]0]3q,>\M? 1XBeXqϧPm;wAJ$̼b jd2E|cC)w۶g S
5 '<Ghu0g
\qv.ό %%)8M;٘i)
~
ɘhE:}x.bv h9bL9s,٫mmf\:;?H P7gjm6nv {]989ΣZRi+./f:Jv`XjzpipX
ƵD ,.YP 'O״evְ̬:<pm=HMEz,"+h}پ O"{n !pX
V7ey[ Y9*Ϡ]hh= 5KfN"s't1\ck;:z_#
Pc E9X:WDkq jUJC#݇)eUalL7eN,V}N dad R
PJTivy o.CbAՂ|,߳X|Q_>- c[p@Qپsv,k`mĤpi^? 5vrsxFG|C *J<h 6iĩ!ROtu ht5C +k|}?OtXB$@$@$@$@$@$@CVҘƔs@4jFsK3mAC[OH
"]IwFf^_Y|9ފZC8ˡv
<>|U~H>au oN;_{B:][4[>:$7o
ή}y<ΰ`cK9Ӹ ;Δy4D~z=x5яt$K i>_& 5B[|"oܴ-!
8^5
u{~b--q2 VkN&~ӑEP<G3h9# E;}˚V]bʡ'8F f'^}UdY"M|>X1jv5kSSm{ʿuVڷf'Bߜ+[6cT<ȸ$+:GΖ]ykvF^1 6Wщ;vcލs͂)X|}t6; /9 ]s6]: 7VIe]n<xM?
R>v Qi5Kg['#+ 5ʅ FܫP#[E3oT;o ﮛ1͊mܫ1ͺ w&8 ftq5^v}O#^^ _2G⿏]]9 [8dHHHHHH.)Z:']]r"u1+MGmM @/+,_ lic:?X | ?}AM* <eˆGF>*vu=U|\jFY`\V@g6xW>Y⬵U^ lxy_Ʃ /> _cQ/ t47O?=q֙ xmG ~aӞf~Sչy?~ Mĉw~g_ (v8k =KQ_|h3 <~N =[ K.^eE5?p^!v3?)}pֿC<!^~{xu)hu; x,LQl +&v6<zMQCxOgϞ9c;j&+Z;cނ o6_
Zekx
ig6mGv_#}a?<qǀ!mFr= Qsٳ&.zM8pD['h: /ߐgB=>s5 G 1ٱ O)y w Ϸ_~
Ͽ%r 61^s1}6^NY;ƶd ÀeN}<~+Tp< \> R=aUuvvʞ;+1|Y
#lcL,9U:Ӌ\ KϐU߅j ζ۷J|ʲ~}sES,8-CfGx:х3yzff8 |iW=hCngHN+nru8'ln:kY 6Ceqb ̪3g;lVa)~W^O8 >sԢ07 ɣ^$'ct -dQoq|nMEϐygpdh{wMq9K
0,Pnv
LG W< s1m x[YlkĞ㮨A 4GdG= Y58`X>F}|܅/g^q1x$Yݔcͣ`NʞL8ottISہ3mhw72nëfmO X d
S)T\f~}<|Y|" @_?ܟQ O>#8-Q:}X~^Ę+z; .<H~ߏloH(*:;:P>sBdQk"~\{X=#Kv|E0vG?xI ˮD:); lqH,*y vY~R^1 ݇;x @
+-}"] .2{2|q=FN9=;# KIayut2:'GqűȞq~X D; ?gy9 _ <K܄OZJ}7 z|Kq"a߀Id"'^~qK`xc> qr>vU|.{;/A/hN$@$@$@$@$@$@
>H: >G-9'8BvCj8.\bOe`ǁ#h9эb̜+gNc]nn\+od w~8<h.aMetm?a4ic l?ц6G
t.~ 5EQuvmo
]G"8p?M\oR0! _ HPܟU&Zτ.b.PddBvXn* Z5ۈ*gL\+/ߣy'^}*^! :GN^' iUxl^C HS}{g}5S1K{ ߍ[OaLqDIqpΔXc9&8e,% 7P.tBĩ
EBh-"| T:ĥ7҃z+afy'nŎ[' ٳ8#u!+k-
{hfxOn`h8ڃx. 1W.V
[^۱tlWz9ɗ6BzۆgW罪x#>=4/ИHHHHHH. 8&̴̳֙^|!W\,p{aܣ _yPw/أߠﻦ7)yNDE$ 7i %zH {uʲ'pb+~/{<JuxBp}]uثϖ}[QVRaBjNpų)]1gd .x 0ې M 1nG9$0牀!遟"薽ԋ \NuBx "N+QS{
YGOII΄qv8#9S`}WD{1nG $@$@$@$@$@$@$@$@$@$@$@痀$,嚟,3Tz FFG _Vj;% $'chxX^C
Y g˄{ C'v-قHHHHHHHHHHH=P3Ԣ8ӟ4N_2CM CgEcTD]ݘTX`uiit('z06 s:(:@Y8#N$@$@$@$@$@$@$@$@$@$@$@$' qҴ^ojgLN
sP<މ̌ &[#Wa t(E'LAΏ%HHHHHHHHHHH.Vj) Ej;}^SǢ =MD M癩Qӆ9&iV^HH#ת9c<#& ˘@wZCΘ&{ҍLgJGw$ 4)EfD ~,j8#O6sk?qKe.NHΑPDzysL$@ffei&HHHHHHHHH?xġ x")%&!y4"4ҙ2_Ut: O ˋyZђ DK^ ; g5 =@N#H9:.lza.@.Ï*:vlA$@$@$@$@$@$@$@$@$@$@$p$^ˉVK~J8&sD5q<u4X_&rFpm# 8WDGNK
C'6Fk\= PL"!i\)T'PѰHHHHHHHHHHHr!FY7
%U| c qbbRG5OQ ucPpݹ/EJ3$@$@$@$@$@$@$@$@$@$@$@$0~ᴎzrn2 k1X4yc= v=s
+/
;&&DD O"{/ @P\]K 3ӣb;u,T\=OQ !p=KI1@e Ss*/11' %U8&cߘ= Y$)y,Y`wV#ԅl-(1*n## ŘzIioM c&q<:ړ \h+%֛*fߒdyHZɪAkF;o;&K/ar u&
/0F1iR!.]+]YgaJe%0O$@$@$@$@$@$@$@$@$@$@$@$p GsK ݇͛)pf ZsSW 3|b=3?CN8؇\c(nddCXs;0<sFԩgφjr @JJ
ԠvT^};v/"^z a/i ʿZWm,fNu8\3S"]ff ~Sx䑇
n``[HHHHHHHHHHHHR%ٲysQ5e
) K_qiQ#{źH5rw^/w9<4$"݃xO`ppCWu<HHHHHHHHHHHH./J#RZҌv4$%-ԢяBKLJ{:wS\CEgԅ[}mxE
S \B-WrqQ/</ J;RRӱc!)-- ^5ѳB*X@C
NkTpDTXh5TQ $@$@$@$@$@$@$-
uђ \t ksN=c>6::gpVf],=.e6uK\Y3gF5U1zߴ$ $Rg Bˮ^w}HNڕ jՍwg֍sV]dΘrÒt -?XS4ځюHHHHH'G0 Q7 zlK$@$@$@$@X2#s(Hs{f]rR2wX" u!FF1}tΦsaHHHHHH :D+ TLSȔnI2n<[1w;{e%HOOC2j
DWPgΪS?d2# P`/1H$@$@$@$@$@ '4%-9◓ГL}[?rr
.^Nť<t.B
9̐N[1z0FmmkةSˤ|$#y\$/
Ӧڟ9s]]]8%q=<<lQ )I&ȉx;} On;ׂ eaZ+qeB\_ ۓ @XJS2e:1[31VT:3XR&'[ 3Oa2a:
ȧ3:ߤ =z#%Fۄ Bmq6#eH=H)qWXX{)zefSS1edg8&8ۀ } ovGLdZZܔbAoP>ه57\< FRd嗍HHHHHH`" tE좚6o"?(7B 蜺:'Z}u =*r2:FɜST2ґc @ IDAT%"^uI1}i?o,6 ;vf̘aov,13銊wwFUUR:"+ICicW{*uRRR% d(6l #HHHHH`[7Y -IHHHHH5&38Uִ8ҘA ,BVb ~LF~K< ,YRSa8mB%%ˬBTgR1I`J tjˊ
cO%iNS!vj:f)\ ?8~p)U"ChT% |7(gk 9' %D P^4#sIΈ<Ӈx
=StjW"
R|Kp댼Ⱦ Q{{?01ֿKU9pdt*?ǯ 5BK ֡ NB v1bB-ݹ:=xB[>E }
S+-sӹQ{vESmE-=nY&ntj˴4_NPi%ԩJ;qJKKvlˆHWXZ,] tt91
:oė"m&.K&IHHHH <I)i Zo!)
{f%?3O<O헥tqÌ! G>b3; ;ռP6Ũ,Kԓpj {GS :R|
K]gtϰIHHHH$JڔelXg~͢/ 2歱u0]l }Ge maw.}v#Ƶ z6OfuH6}ړȑ#>sZ¯Lիjv=iķ}yՅH)&>Ti0dVSZeŃHHHHͪƵ7Vb]G>p{4a;m+Ta
U |y-,yێ
0e:'Ji f3/q{t /G0PP],56řጺ1j 4"|>}cMPz
N d1Hă诞FWr: 9_@.!vrV% 3ЯUe---l85+NWY9T6vzfKã%r3 F݇q?u6MN-9Pf$@$@$@$@$@2f^ X 晭pSF{a]}F{ya\:{ l;a⻰e i}xJ83gjK 3%3XHHHHH jJPWRaE}'}%* <Ё+{T`5v6mBڌ{; ΝVkbTM7|~I5Su܇MՅӧ{˸XP|444̙3UwLlgAaaĥYi{T0n, xsT!L6dHHHHBHUss+1 wlEf_ ћ:rMTv&F8;b.Jd*C9y4Ȱ #8ӧZ<ӪK=u$C@[ kg[Ng}g?cC>JBfo٧,H)U,s* ŒxZt1bT#7 {Ⱦ-) WJz6K+QYk $@$@$@$@$@$&hնTk-E.Q~ y%!<Embk7
ۺ ,Ց0Ү|꺻*ŧ~{, \ErK-|gg?0aF:}]g#It6+C](J ħ*%2*ŗ|S , A@H*{bj x7fxLLfUKKlJ!UoKQ)/ql{{DՂ"]p j&F7{zR{-s<-WQW7?^12|^(rT WOxj}nQK [л_ -ՕKg \2p:M?!|_ s.*̿cշ .9߈?x,tkss KSh'Hv1a|&* ڞQ.8|l3ɩ5p
ݍ,yTε/#; Gkӆ$ӧ x`
MP?,CgVVo~Ndl_W3)#IF2.SD3Ua b K3` Pq?n_4lc?^"%R3ߴ#IYYdJ}a+n |ߙ -_;
AKI~Tց`| Xʷ|
C-3e=}<Ha|kX7`ͦ&[cHJ<SՇ-O~֝k4y?wz62ep'yfVOWW%e{uW5SǁvocFc HxŞ@ M6]Re; mf C{J nf
;~і8aMg7p
Օt=Z:ܕIK<=ĒǤI|W }ħ|n빹8R|. ݓ^,~ƍ:
{RR|7XC{ @rQ NMڲG[2vK낄<v^q2xvV֤ݸf%e
u x-կ ?rjԒw_<m*a;6 /%uD%!AF!G Ryg3|kȴ Ɋ5ܸ~GSKf_o?ۈo|:`gq
Pގxoa5'k?ĢW/t>y cϡl{ <f4܉{qK+b'
S$@$@$@$@$pyp;a@Gψre-/D>LXUh *P1 sYxJ[S 1", "pO{G)3>ץ
f̓HHHH ̽~xll?>8dub/vX16J
;k& ,\
}2CoJFZWqVW/
?o3xNʒ=e|̾AVڱ>v'}yo
\^$=+S,v T"7')Kۧ#== j=VIi}6˻酵=_{yTd:}??JGfνVeV s"LJI)KmO:Gѱߌgl죸ȒULYŸpX)%iv|z,woHHHHH2 `i:<W7mk}>S˥ܕnօ|0] F$@$@$@$@>* cuwc<g`nfuZ*L6 wJEjMVn-n癡{}<VȔ|V^.NLNC8;eQm31y*:Srb4O "Z-*)*[mo>sJذOY=Ѯb.x˦§qjV}n}oQb-WlqgM&*?rT/q~4`wոҵ0iR1n] g*9M?yaRm<K#^ 6<uc۬2 Z D ʧ tg%'R|.s؏^ +m|Aj>:,ytr]" dz(qmz4^9sl+j"{Tv YFb{ v`ƲJ] %+K.n#B.Qtjk jJC- 9 KYuTU`\3 =iQ2sa 33A?Cga-S rꯄDyӟ"o@wĈ,i i ذAv dܜYV"Yz3-ҒM ˌ@# xY
ֺ" z{TzT=z]J.-Nsn-d4#K2CCHߣ8LeffbH|eg pKTEmVYC-_ /WZ.lbxhOHHHHr"fY36mʀ6lyqn_f͝XoX5 ˀFT
K"{" {JVqu&Izc?a\ Uv|ϮJWݏ<3LLGcudYҌy3v*3Oqy/mU?iDZ8;Va" >T[e8&Z)v;HJA{w3Wgc2:>{mlN1`=wG5Xs*L
x& @I 9C?xmC ۗnwNjUG=hgtN.1 \|Ysg^ Mܝ]ʇ|*=rrrWX7Jx <6ʧ=3}p,>]u.[Ua2SA$@$@$@$@~83u dqlٸg~^{%KqCQEjoaۡ3Fmt ];Tv~BP J1f!vށv }93<Ϲ}3;q{h0+d<ˇS
I7/>zr-=ly ڟ&z`HHHHHr <AV W]ɸ+t8{ P ib\xMtwWA;pJǮ
U%ŢWQd
SI>֪L FU0:Ξ^[D}Γ3PTTdXZ .XkQuuup6є//X 6=Q/4+ɘYO3 ݘ7هK _4c
%H KVB/tH2|h%+3b8/7K7> VՖcٛm$,aszc9NE u1fmޣ7F{O@̬,33Na;7MKD_7ZdqY=/,|ʦ7^7y z{t o?8X ]]3*قHHHHH%t 8U9"KXuv4r_ms^/#tb&]#7'PU%K0piŅb"+@ϓ-HN2|oӗ_8u
*-ڱkN===D,}9=+cS.M2Ƶ <#V/\z wcfHHHH@"٨Zκum)7WbZ%U.a^TbCf=S`^WͱuTN[' gLD|'v6tfwx 6-q<(ی֕P ݶ8iaΌKmDqC"辱>BݘigovY% ^QY_vGJZ$$d
xd4uU|` N]`]S m^ z Q҅y6vFzVKc3v4r_ms,^qq"ѻ^YM]Gaz2,F|(_gɓ'7}QgR>/3Qǣb}BXXX'ltCR>y @(s䙸¬Klo^>!I>[vSɲ?uXp y}#Kl 8=b}DZjWqbe8
K0izn+{;~4uy#N}N5̷/a]/遖x:o6cSpec3_Ɨd>
1кce'Pw+IHHHH.DO^_|O?zr cF*uxCYES8٨>pW0:iٸJ= ϑWZ?%$,ꥻ',P nט zM ?322P)rHo !zY:CSCR>Xj3{5RJ_ £kvC//3Q$@$@$@$@<,X/?|T^E3|EV2 ~'I/Cp'| a\=-/~ oV3\h_y
db[X 3VLs_}WO̻0, SQ vE;nlշt>rrSFV=r+<qZ^~O#f8'O ˚@Y9w,? 9bN[ hi:gdUE
ܔ{(df}P }:qV^2ڿWfpKFV܀nW7I' @2`J#_tjAtvvK`e+ 0uZ LtJS{ M5ŷS>@x_K0rB=jNaV3Gr>+T$@$@$@$@Eb/Xr5-121;6oXPQJp536dVF}q-/߀Z]SIP;xv$0+Y
x\q]y u/̒K签_ƲwƩ]q_/ _˖ y Wݏϭqb-UL8MN o4,w,Kj7r%7tU1I$@$@$@$@$p>7iAaiC]z^Q??[J ?mv!)t?=^B\kdDh1z]Cӿ@enR eFT(OE6m >\ EEE>sF|>P7*=N<RcF^ubJ x ^O1X:<$B_<Sci)]%&z! D-
ܰ6x6EJud#EXU_nG$Yw#u=a,7;-B_ʣH/?:6o\f;qmף*bC5'ғaqw~w8Orp)^x/{nlQdg=l3/\4 ͮEмwUHLBa|`.q4k=ǫJ%!;BʧצҙXګ>}ʵjx<WV' E@=O?+x4/4e{1 I\" d+k4yr uqadd}x?K8!E 0mEi~.!M.)f_#e,#/0rǝRX u ,c9+O-sotHfM~iEYΖTgS
cC'qC5x>LϚ: TO 331*c$g"7 1 #
dP }ZnҢ\SL7$ތwŻ([LOo(6\yn2`/Ƕd3Ҹ H @>))D-,ggDwBBNiyF 91,UΎׯ 賡#gzxE:3g)CW.19%
wt(vlG2pA^ P:KEILQzQ[UUJJJ$ӆ`;%C b&[3fZjω;ٳ2(H͗=* w.u겧O\pHHHH EvI (pI+YCY:w:]3<Dh صZ~@̀ -HCb8Lajzܸ3@e \d)WZv2v"! 2fEh;Uע5mTË:gg9VԸNfs 69V]QyE<p(1.YrQaȚBY8+uÝ ~b- L!evS$@$@$@$@$@$@)Ih]Byfv.8gf7C'b
%5P{2˜b]m3A$@$@$@$@$pySG;62lup6 Ψ̈$@$@$@$@$pp2'jA(\x}UU`ɧuZ,szmg0A$@$@$@$@$@!9x m42$! @,-G3 قVp"XWm|MVhΨuu>;&f3 \> EX. EYEDD hM*ݜsp]BۨF β$! D2X *T; o7X1 'y eN@)L^.1عD9G 9R>9.Y)*,vۀ9 IԘ?';zil7 -WK958$5%~H$@$@$@$@$0^II-2؞HHHHHH `kKJ -dptp]ݡc|.ic7M{U9'**A?HHHHHHHHHHHH"֚LND na#>< M:2W`]BU=~uCleN> M! c$:cXDi( <d-ISz8:? XB*`4zHHHHHHHHHHHHH }.
N8:ȝ"\rRQ<
|mSeQ@D,P^A?}[6< @8MT6I̱3ꔡpRv s22 CuNBqleʜQb:S7omy& YYFJJ
ܻ^gg9 >Tefff"%9C8;Z8sd@o+{0~2U+o"y& dge!WTkW6i'L\nI,0'Ƞ9%NJb322,OIHHHHHHHHHHH."}}"%#EP3s:;Tڣe&YѲƬzJԲmU;K.n7<ߺM#[ږ
''+exs9$@$@$@$@$@$@$@$@$@$@$@$@$@_ DlKIN-G2RvN8Ŷ
ND4.Ч%{7+''wR atW3 D@4&Gf
HY;EN ND,y%63?Sk"sZWSi9rTSx# Jj.^y* ۆ;;3ޱ h}KFa:
S}o$ G:vNx]\Da/-NF`
;oNMIHHHHHHHHHHH.SRS6.Q-svp5zq\JX4~uNc'%gX $b]L$@$@$@$@$@$@$@$@$@$@$@$@LmI&L-IJPNIiPgHږ߇G&9Nvιӱ95 *PNH9YoSNh\^.W|- lYğץj?< @hd'L-zN1Rƌ:oslZ6`HHHHHHHHHHHH.8R@:eNJ
9)o=\]lXuvSD ϼ%{qrN#AeQuA# ɛurFBF§7/E+Z;ks:w#pu[HHHHHHHHHHHHH!јS:FkoЩ8B\#Adǟ(KvAc$@$@$@$@$@$@$@$@$@$@$@$@5@) 626MW|u0,@XCyNQw'nHHHHHHHHHHHH 켂viLcIojSFLr;P
ePn
HYvDQLr]b BjKFSt@ʱpR֛ ڰ e4)5x2N1wuуUPjtNe/ NuӘHSI9wUiN3R\3
Q %}%rM@3ӟq(XGpI$@$@$@$@$@$@$@$@$@$@$@$@$`Ԗ\S`2sR,9HB%p_L!Czf kN8BHH Pd_cpxיZvjwjT2ޚٌSL\'m,@!@K .tOo]Fݟ[r}E @ @ @%ġTʾ]W*+ `> ]_QTwR='ΝCo@ @ @ @ @ @ $7Iת:0:Ļ*(g7Hv˴.SծMy\@ @ @ @ @ @ $5ݠ<_]XJ{ydt]36fUd:H-r6Y7Yy|S:GJ<Q{:cg h8([
rEJN\nگ߈/ @ @ @ @ [zI5Qq5ڪ5ƾ+ϬbhG'=ĥv{kJ'qcuN6TZꗬR*j|AVܜwVӓ2{(vZz/ws~@]L*ץP|6udeuʱ~(_ɓ0sO~_ю?̩nU]45Jd ` it?LZ+^;"u5e;1&k7HzNƲ㧜 @ @ @ @ .*4 :5|!>Fڼ>++Wo_cul*S͝y-ɝp}I9n] ĵuĄ#p f@>ՙW&CߨVP]Sޜ^| 5=P7#4yk\tX??vUZ
j~ pkk/S&'~ 8)+Fi❀:*kK?2^TTʳSmeO0-@ @ @ @ (`ǘ\<R8WLjTɳSv"Qg)+$j)?nE6
;(kV%V0;;bFRVG] W<qFN?juM}W[Z)X.&}Q> N`%ɡfNauۯw s-s|Aay(;T"^~MF 8SS;-ONdhxXKJT|nZVdǏ H[r|Fzyή
U|7@iffk/zR0*/6.*p۾OK//}2luQQg4i!v ojEupkv%(3iگ~NȕdSؽrקZqKdzh {%HGI] UVʽC9^WUGŎ69?{|\H# hZX@
A> ~|M='59*xe|o+qfFJO~E&sEK~9|U.&bZY$bp'enR)Ey7#CqSw'~s[++OoֶQDrɎBɓq۟npeJ\NvNfK{ˤr:CI9(ןKTή=v' C~H j{{P\5]D3KZ O;wKN4=O
RdW + =xsк]7L^Q·ejdw{pS3HIKW )]{UC+4 ߚ *AAyvQgss `vʓwUj0veӖ*Ʋ=
=qX ꪭ~ܖQe\ [_˹G QK63H/%=rPTK5j|rAp5juɥG9 ?;ސ
?%RSn._+,G^j-qZF@啣~\Ym_nJ>߮[r|wLNiJS94F?kE~"aHA[IC]:~AN<Q?j{mM?cw NU
GW` lUgmio
è \wk] ?Ҡ!c=Ҹz b]~kiY9}|*կkrqԔYK0ޕ]vIu: @J_?-?-*kmxJ;] 4U ~pmj\3crі5c]ժjp}=gv +Ŵ8sakUcYT]=תucu.J?ᛄ3Ul$صiݮt sOZNH~w +P*76@[+Lo^۫29pGRRR y //SsZc _+͕qM d*T7_o nx)ǮITs/T/Oz6l2k;=.-&7PzV~Y;W9'{Q?j{-8yײ74* Z&4mv؏3&Oڹ0;R^-TARSN rUk9aD+oLJ7HUNޏ E~\oBj?ڵ-sދ78LNʄ'UK ֎H_Mv ߙ.)@ @ @ @ R~eFsRiO$ QM&l3x:PԦ~X9Vz<8Qo~ON9k ܻ- >ёa6*sc/ˉN ;^9Y0.7ۮʽ\<sqI͡ẂHբ+{
ܖΞ$juqP c\;[c\:y)brBsXv%RFYݴ菽A~i+Dw+*}Oy2(c#ݔ"ΫǾwS M:[aךPߖ;&E-,IoWxtSNL8q)Ԙ
]=^ 0! w|_λ箕:99l/*+ nnl\ 1ζ
%|{Z)
u[ͳ
oA9
ߖwZQVV
H~NNܑfqw꿖Rwԣ_2<V z>nlc@tuT<1
8ʣjeM]@ @ @ @` 1&㙊[9+W`NqAuͳ{ov%UĄ+PM*h&6ϧb~cñyKھ\::C %UjѺBsP*&!/?7cQzڛ<P/gUyfܐ JNntwUу%pIV%Ҽ-S\7VȋuFtҗ
~Լ}L_ᶹBX:y n}%>hq z^-<jl}IU4nkn( lS2p@:>=eǬ%/ƭK4?^s'?scVϝ떷miЏDk* gUi>&;f1Q,G8a}aÌ qU]S~W)9v*ma3~k8vfݏ7D|rT{ꑔ㒿?͠LHj~\+o.y_BŢ1;gqG\>sZ No -L+Wt4JfI Z+^R̄?lR^F[a[zVׅtF~r-@}XKvΨ_*:*˺-N[햽==/OV#hOZPSbcr_ ҩmbzH#CFzdRF\'QռWv[];HgVko@A&}Ӊ*\;+c2>'
˘<O9.A:#r"NevNwQ۫!?gl#`V&ܯkR0_ ө,Z/{h
Xnȸ Q~CEJΌk,=ᷡ9G*X .v_?ޯ>U5?4PX.{7tZNK% 9Y]{y|! +=hs # Y ( e /0iVz)o LtRm]uvIV'~qGǤ,wVo%;W} N>30Y22$#Z&W HӮZR$sbCT+^1I:Xn4>4'vƾV[SonFd "IDATlZLoilKeݹ+9x[̒2Ή;
f+j0d*C/d(锆禳ZΪ:2>'c69>>Otv^<^!@=B-NO+v]3
{f'XL ΕP,oNH60;G~/5/~oV ߚ!y4ȉժ]}s-UR~m\boL a2)ZK^Tl,6NaViC JoMRU]nW}Fm^]ҶR,VS^Qy~ 7*O xHF҂Fcfg#1] <| b"U0AMW/\".nqv8O;Y;tF '[+0ag.D?6gٯyA7+maZDm n4~IY;l3P O^Z tˁcڿWe(/ÏGrŸ2N"SVA:̪rEګ`IZ zD uߕ~4"8|M<͕?hZs7/|.m 1s] ` h5;+>aVzwz.E%, 20t-% ܩg[g Uz0X k0 {gʼn?dsL~oa_\g(Wheef/Y?eUjT .ׯs {&I;[R>&3SfәlJy8yN,_18zЭrkg_]+Z˦D
֯ $i>) ON;˦Ujc
OC=VY -yͧd״O\jPfr{Ikm*9*KQwp(*"jsNL@ @ @ @ SZ
)7x".i?.P7`p ?zԤ;Ɔ ]wYJcu/߾u~&p97*]:]݄ V~7#[w^ͮo`t OpZU/˯LG\ι Ӗfi"
rjk7^;ׯW)1L' \'~^J45-TjʭsIQ.Ͽ tF/6`ZJg ӼBt c~hۇ3TA
z|vh-wSۓ" `
d1䋽+qL q]S K}tv
;g$plOkK]˾+3WJ}gq1ȗ',}R6mt991T)vFO+S7ֽ ?R#rsd|2s]K[@]O}^sz璼N:$[Q[+kfFb*h?ԴW*̒o:'Z̨:_@y>|AAu:~_л}hE -;Ŧ&y.s^;R:uB8yQЮϜxGy,*G]kTqGyFb-kkzY&2!Z_[@ @ @ @-Ś-/ W%.;;շrj=B&xK^ݒ.l+uۻ"!Ǚ@Ji~we&KA݄nRδb rbRZ]U5Xj oTZ_hg8/ݼIn+&Hjv#}cX#t ?Q;ƛSSKSMtJV)s5}MOȣQ7#wF2RkE<Qgs NFDke { itb2v3.zj7ʾC ±j 3wuׯbaT5zCcv'C a&, 9w)/{gM7w! MdHظ=~uWw-)mV|+#zZ,LH! h1&̿+i ʳ&]SOyG}N;Kp1; ܟW_y%&Z-u#
}9^s WÛQs4irmG6+m$v_G9AWK-Y#GJJp]Jծ:w>Vҹv &LmǿANwzj8*ohN/5%SM2ݽW|7CN^A<=2Dmן -@}
B+oJk+`'y_:dȚ@IfkZs'ݵ]2Jf_UCphgˤеzm
_?aX~taƲi5 sd@\ T*|cTMŽ(}c8Yu~z=/ɰ r;Nz) ):{2 > [/0Lڷ^Sl헷s Rbuݭ_JoqYﷃ곲R ݑQ@r|_-gR||?hhR7>ou;!-WݨT3np4.?_W,nRkKdd\nܴJo `(K_Ϥ'&99;']r'q !Ty㚗|56u#X
U{u_;ڵ28˦J%-mËb?8,U'co˻ʽzV͙[פ߱? EmN ý:ilp~O_H}~mɫf@jK˷
tlwsj~ϨEu^{YT_"ݓo>JȤl&
JD[}3l\?St+1?R(?|G6n,7z̺Rٵ
ݻ+7\ T|0ac,ꝟX>t[&WHˮ VonO D@ @ @ @` hA5[ }0KK(Է/;F>R?#K7ٖ<Y%QV.{]A1gJe\vb ho**g~WXa G{9\:u^*
̪}T.~}>O:\9_ 1J@3n&
i0>D^6»%*o?l* 3ހzyQdkvS# tVZo>l6nCb: {A2o瞃,x>&mWҸF] FmH.Oސ窍Rм!grG7oi_jd<)mN?Vѝ"p 6i]9n,M?EmniV' gm&3]^/Ϫ ]֮[@ @ @ @Hc
f&
Y=qG S=7 Naʝ^Fen:cwG.tƸoO=wM~wS? <jݩ +]2 S_O>]Mg% _B1ipJ"Uܿ˿JzcZ ûMO7p3x\גm?9z(f\& R fl}Ƥ_ɿ\>R x
(/GQ~,{p|g:LLɴZ9hlS2pN936>xSH{ q/;sw^( }qM=`86/㮟9?l~Ip4]X~q[:VI/V_P飳ҝz.or)3}%cq_g'OJ˭(b*i@ @ @ @`u cKڪ,mzGFofc+5G3I̹/ohhHh'jڟUAqVY%nGeۂ+,R֚:)/mU씌7mgs_Bۍ\JiU!sU_dW:RctrڪG=3N=.qjrDztwŗ>bG]Tl 27S# O5ο
L;GsY}t$jCU5;on)ekh4P.M1gH~ŕbl,Z+_!V ҸeL$p1+iv7T-`ַ1y)w}L8-;HVYk|,7܊[bh^# ){p_ x|~__(ڽ5(k#o{zEk?\.- kFb1;!ӏ;"1ʬ]c\kN=IF`4 WJf@㕓5{K#-R q%MDjOH\>7OS[6F h45A:ktڇm:sHwՐ~F1gH~#ҭ--{\R2{LM;@ @ @ @`e X3J WHU"l?ZM[q
I7'WryOS @ 8Qs kˇ3O; E`M iq
} @ tzrDm n4j# %T%//OF3_<}OQ]wV}̌<YY\+|z kxgo/?n픝p r
I%[oog /7ƌ $X6_
օ%iX=wDFGaI6e!sV%M +_:&up Eo ' ,]155ӦYVUmV.>+uJQQ>2}ܼoC]vIuA~@וM, 3 D`t|\fT*W߲vZc[f`]l+"
dc< ~/*X㞝 R$]@ @ @ @ @ @ )`ŖX(DAO''ChD܂YӍ+03R'jW:uȞ'wU! @RD1'Wt'OU`^{z g .(h~w<+垤; 21y*XmwY g_:5ť0˅` @ @ @ @ @ @ cPisssR(b0PrwکA
@ @ @ @ @ @ xwlɝjڏ-Q`0Yiy ѫI,<2?Z" ,=F
Tzp 5NA+gDl Q1:ԟ=Ŵ+ƍ<Pyq G e,*~9Y&^@qw}y =[C @ @ @ @ @ X*n `XU\Z 2Yf5ujRi+JaE @ @ @ @ @ XiĘ*i ԵڪWmp\Eo xUA52;Msk5zu ?lO? +M M+Sw9 B @ @ @ @ @ XXwo1~!fԴbf!Θ KG@I%L%+[#H0 P@ @ @ @ @ @ , d#tf ɖe@]$-4@ @ @ @ @ @`$ =eZ @9dn <GqH ,4bKbTʖ>0W
Wr B?j)(( Yf>kv#^2
<Ղ+҉Sg@ PY&&&칄GN*: *ۭ"' }G:@ @ @ @ @ @ @ g-dzH#8;1z %+䱹4 *D+#/V[Ib\;\:g @ @ @ @ @ @`\mY{UTk9{SE]^@ @ @ @ @ @ cccvjV{:#/S.VyuF@2uX2u4$ *ҍ7d`p0vk칓|%xu$ a @ @ @ @ @ @ gҢV=SuQ +F'B@ @ @ @ @ @ xkOrh3㱕+$.J.+1@ 7 2@ @ @ @ @ @ VG`jsg qCS:#
X@ @ @ @ @ @ =ZG`NNNʹcW+? 0K2::A I$PK]`" *~MA6;4g'RN(#dґ
i D>Em 0y2`OVZ:O v@ @ @ @ @ @ @ Ȅt 0 m~{Oǃ@]:JA @ @ @ @ @ X9 -@1 3Ē7#A @ @ @ @ @ $&YP<h1uHbXL@ @ @ @ @ @ X屨:7*rSF @ @ @ @ @ P`cN 8TF2F ,{l uf$@ @ @ @ @ @ cR etO]@ @ @ @ @ @ PB Y>3ey*0i@ @ @ @ @ @ 3-I:,XN nvn.@ @ @ @ @ @ X'֭ X1 V1E @ @ @ @ @ @ @:\}J-fxTgf\K3<%@ @ @ @ @ @ G`CaI
уiZFZQZ^<G\kpzѾnN=r0X:C,G @ @ @ @ @ XE
ecq绂l`K!j^`PfgtF fnΞi! ,y)R9=fٴuԃnzI\@Ψo7x:!<-" ZyVԢi*Lg ֒V.QYQGoe_̦VO].[r(D @ @ @ @ @ @`% [I&ǂ l-" $u+X@ @ @ @ @ @ eV1Q@ @ @ @ @ @ $@n% Pl*& ?TdT} IENDB` | PNG
IHDR
iCCPICC Profile HWXS[R -)wH
H! JbG\ *]Qp-@Eee],Pyo9sNΝ lFU |IL#2 Fl('** @.nB[(l$u*' DAqr > @zYy<Kp kJp [Kmb f@t $tGIN 'ͅ>99+!6OO|dǰ,l3 [rţkFGKby
`*GA|ϕK qp~#9 PeA1C#lt.G#!r*̍G r?2x!'
I@ +
=T ㉞)G@q(+&L>aQ_ĨP -l 4a`ƅrҵ`-``\,'J 8`\ N
-[ %ǪyAѲ<cE1s{. *V
GA8 İ\ -l$ kFg$HGhlt
˘ViB, \=pd总nʣ`b bΆMF{ NE07n#
BO^V3 3dʣK>GmpS =! g#alNP=Coq= ,,R~1 }#.~Ėa)"vkL֊u`$xH+ath),?jc`o%fH^ܼ9B~zF<fcktw@˶7 鞍0.} *ӿF y
7kX8 e:v 3ԁF `
"A,H3`3@< A)(zl;A pen{. 0ށaAH
#Z>bX!+ H4 #%H9RlFv ȯrF H?b(UGuQStah,: MG"]nDkнh3z
@{0E`6+EbX&`eX%V5bmw`Gq&nk39x> _of ~
A`Ep' YRB%a70,|oD"hFte18D<I&>&H$-ɓIb
HM>"Y@$'br%y8*yXAED]!R0Ga.6+
}
UœKɤ,l4RRS(***)NQ+.Rܨ_bGՒGFSWRk'woh4)EKViii JJ!J\JUJJW^*+(((P.RT>|Ey@EATO@J-!Ujj
=ULԸj%j;N=ct# C_BE?KS'gST PӘ1[JFc2BٌUOt[>qq5k4yeM74?i1hh=Ƶ-hҮ>=0^}xAu,uu
ݤ{Zw@[w\__BӇ< 416046433,6l2|`D1r5J3Zgn4ho<xq]W
&Mޛ&.5m1}nibVd`vߜfmo^c~݂hjeբt̰bZ9[Zu[ݬ5ַl6>66
6 pbۗ'$OX3vNvv٫ه۷ٿvt8T9\w9:.tlu|5j"obNtNKڝ88 ]]R\rUwr]zGwgyxdyx>loҮI=
=ٞ;<{^)^۽z
5ޏXF,.k7뙏O^vBþ;6< 4 Ll r
t2 &Vn'>d0%t~0jXLGk'ߏ0DDȐȵ̢~B5jhyc13cļ]{/<N ?->}BEBOIɤCS7iZ鴛ͦϞ~qf*d<BHIHٓ ɮanI q6p^pYu~',3"yg ʌ 3UfpYYY# M9䜔#5AL^<Ҽ|0n".j-Pǜ'qoWaUYV-1r9ϊ~mg0o>w,@.h_hdaߢEu)^lW\QvIݒE%
TTXzkmee oZ[vܮ
ΊK?瑕i+;W9^M\-X}s
Պk'm^\W/VNܶAgcMƛVo9c*ߪ-:[oyj5qmƴr'qgΧwڻwEםwߣgU n;mo>}6;M~?~M恰]6 290pY3<y%5H6ÿV{h1cS 9QtbdɁS lw:3St
;{\}ΟyEG.^j|éN tlr˭{RWO]vz7"ntߌyִ[=ɾn{=PyPPa?,sQ̣{9_<=WϏw1y/JTsKb18Jj7ZojN|>5]λe >}txS§gó>>obk#9##yl![z`C x] - (^RAdE) gRq@" 6 cY ut kr9:|Q
ad. 6 GF|d'"<o
Q k pHYs % %IR$ @ IDATxyP\7@E } Ђfbq|f\[[SuVuzޚfrSI&8v,G-[$k#Z !bmE 5X|sݧ } =</ص;p (@
P (@
P (@
P |*§0
P (@
P (@
P (@
P@`7(@
P (@
P (@
P AE@g (@
P (@
P (@
P` (@
P (@
P (@
P AE@g (@
P (@
P (@
P` (@
P (@
P (@
P AE@g (@
P (@
P (@
P` (@
P (@
P (@
P A`""(LF
P (@
P (ZږbX'
P |$ u>f1 (@
P (@
P (@
P G^cVB (@
P (@
P GNr (@LezW^5g)@
P (@
P-0>6| (@
R
(@
P (@
P (@
P |'@Y(@
P (@
P (@
P TT
P (@
P (@
P (@
Pw Κ%Q (@
P (@
P (@
P@Xq (@
P (@
P" |wuO-/Vʕֹ,o'&@f5
P (@
P (@
P`ffԤ H Xњ`j &:+=?3 Y$
P yߘ%P (@
P (@
POzѽ4V!$$X)zyjy ݻ)<zC}ClE
Ds|R]B
P (@
P (@
<kRof'tX~W~tvvb|̂5aR3 ϛ2G
P`V,~Xe!ˢ$Mɢѳ`
P (@
PXSObVZ%DN
xG.>> \bM.GO¢ %Bx uuոP$ec]H Vca4w&+܋7!X i bxޒ#Tǝe&_lZ2U[ԊrqKMA4<zV x<f$_3`3ՙ"sQfF
P (@
Pp_@
[bL)Pexg f\'^!5'Eiy82FSq3
BIyOKK÷+ V:y, ߿KaQY||λ~"
՟}fT *MW|]|/G>?#zf?G}!ͻP ,#=hQom +V.ϐ`Ħ&!BTK 6,²g~Key([W.{X%]Z\D/ WO_A`}m>*rjeYu_
y97_Ɩ+a+^_ONt6J$ (@
P (@
,q\tR:o.R P
ֽ`?ʊؘH[e
uu`g R?b[.$1%Y}/MQr>Y;>_R9ꀀUbW`L
ݳjU8UJ0Y! ^So|02蕋%8"{pGE9el\K1rNfLj `8IwyFzԹrqfG*^9mYQdm'?[ rb V cAx86V{I@[<" $f䣴 ϝ@qYDŽܦ (@
P (@
, ^fԉtM4V)cJ?e?E/w~h%82 [&!9 Pf'>x }>oɣ1Y `d)]9lBoEb ~]H3 x=YTB%]YRBQq`]nm L#$"YԞNYp|G.j<7?NE磊=7l'o[d4 N]=
}{{ؖF7֏[& Z LP"ȱ(e#\[ByqHTFp/!D=.LHT !>Wb]l a," 6.^)?)@
P (@
P$ [hn}41H)F[1xi]|xS,{qS-}R,B&2(=0աcq.kFZCb+.pG`:BK`G'N5: RBVc[./[p]7q4;sr$uaQ}q EM,g
R3b JEFfތ+aӱT_cb_.ګSwhlۚtJ9rw BQu lGPzhGK{Zvp (@
P {[hNJQ9MY.O.*O { b2"P[+O|>?I/.eO-`9<־Z?3-,B7 ܾo/LMGFr5bz}j0̂DHwGÐWP`}4ԈZ̢MH^ն{ou><B+R{p?nW7`PvY%DIt8鴦\[=2rY%aш.9>41`8ubJWP?^z0Y9[
Әx8:_+#-Qaw;ñODyH%үI,g&:ӣhmtXhE=eZPH+H]
y@-itl웖Mdg 0a-7@xC<,lt3{STױ>w'+N>o}܇0u`n5)H^uZ{F3-#Gtkw| \='ZIA
"VߌxF,CNV.+L~d2tc.;ua7.Fs_^;Ǣts1Nԩi+ iε \ (@
P (@
V 19F_N*q)HԦl
!A +:z)ؐ*F %;}$}Z9 k \m}/uh6ݿO(}и-=ʋoq{I ĥҠa)Z&XDir -5hґ.GWC6tA6λ<yx!1^ څ %LcnRd{P:s="aL:ɱ' ) s> ߕ#/q z4FEJAaMl*Y)n.ܷCOj.އcU$ QQs_ AA.*ǻ˧6^\
9$SK>ƩtCt#zӖr6Tc1mGT
KNv i`)I3OW-oHAJ2)].7q+0ة" g;36
^!hiV>>o+:A^oS!amQN[/CZ-Oƒ(}ċ+ނZ<g {
%.¶ͅb.S4eطk:ԧ>EyY1.<+g3/KJV}%/!"!H~h uOko؊K8ZyS+͵&E0뗌tJ 4VzI6i"%EXh=JلXqM"v;{]oҽؓSI.#~\<'J1Y`wEݐ=hv=3_j(. HiiJnc%N;([ t ;?>Jg7g\~R (@
PPS>^
u5ҽo{2[okpL
]%NUSmj2 _{ԑr#m8s W[Ye.PJ^T[x$_w ~}7֊X={ (M/CQZ2l/ tN^+طPߚhz݁[(7?QipڥmxCBx- R[v @gE|{<Wq(WЈRK_?9HL
_7F7oxvo7R+bOVⓓ״<~oŞrܹRNG rCMx`uWo-1 Dox m┸Ml<Ep@ NUώ,xo"HgM 2
?W ; UBuG#O,} e Nj?ǫlg^zl/-Ŧ2vݱwz`kzUz7D]i虜ciZ^GV 5I6{A:m8\l}} Hg;%Hg[x1!gF\>5 |sK?b$2ZBİڍn%lڮ_oܼZ \;k}, V\!=#G#?
>ݶ Hg4+ۋMOģ-.鄬QΖ:MA:iǔ/]{ҵ{y!sw낁 (@
P |Տ;pߖڌ
- sVMfb
+ tI֫d=bq[tRyO {_* q7}dZ}/;]ؽ'Az mpE%߷Rhr}W9㝷_Y,@ Uh{P4?y t#o!k5\?)OqNSGOvݾ3^s'$ AJ @kwtRQ+St N!%CԹ;杸yԞp9]yKmGnNJbPkt5ɪ gk7c<,Ʌ#R@7p 2Jog#Qk`b[8WYֻį(lJv>Ftv:%XM(6vd:0 MzփHEs }}h"nt/\F3" Шls!B.{gP]Ulڳ)9'qbN<eݮ¥r/l[b24}iOOq=6;-MxEvB"SDu;rl)*ۊchV϶$XB҅AуI$qwtI̯]yصW?F;pb- '-)²AmYډ` p{EGjn!oC>W璆puMMx*J7<8%y7M㈜߾@ ReګNQ8yNd1mMת1҆Qڏy("~ &kVډ ]3o9a<|ܿ<{*'(@
P (@
Pk\X+L? pN{P:y,wԈiY: Bqx3) E Qs^mޯ DllTjaߗ5,ĕx~*j.Nl)#I]7QPQn}% nƩsqb-}kIA3-k}!|#fΟs
&Ѷ(oN[oõY;ġwI<;Ͱ}`w{9_ :SJj[eėV!v7X\kr jn7u
A-sΜMZLyVl'2/+aضрۑ+1HIKǥ6Ëi?,]&4αG]&sܘNd,VDwϤMc}ws+Cttus>/53{
q)2^p?m͵gpw_+nƥ#ҵ>+UlZilnKts Trӻ[Et͂QXƋK-;k{vp5 *QI(㯌o =e6.|:\߃J 9&8К& 6'Cno3rhT\w ̓wBA5t 4Iۖd%˟=c~ Ì3(S\mRRPd*1 6tvnEtx2²w]@.|ە&~K`yiƑ?|i
J;[a6؆ 5볦7V0CIZBu&\ƄU?N[OU_Tey8"ϱu{21bJdϼL[K#M⺝PF|#~F_gI7gvCߡpܳU
P (@
PX/gm
*fu`ҏ
0:zŻnW7]u#8{GZw3 ?ޙ%' s$_O {_,}XcR3*? δ*Gp6L{/W+ -÷>CmsT/ďM^b('>sq; Tr)q!]<.b("5::$ $Oi'ňvC=f=f;DP 5oj~kYM5ܓ -&?_~/oLM
pU;D:aNd!}T5;!?w6?(zOᓯ/]3`eq |G^|5mcZyI
)#j:{ѤF1"CKS_K"Ղty&|[ʈQ: p //OXܵ?Q_kO!E 9# {gǏxJ4f5H z0tO~уSNx8{Q˟bx*]N=/zDs ڼq9v+HZNƅuyE "E'-=hQ&-f=gݮ+o\S=bN~E!IP }]*y F-H+K ي{;E:7"Q%ڶ4ܸjxݮabh%|><VO [*=p\<{
(@
P (@
P7Nk4Hw\#U]_x~ ӇQkC,v4=~0H'RqCx>qy.HܡtE_#9ξQ{Y hQYyM{zuq;WCQa*ӡPɣa#^m@btW\D%!#TiA:bҥKT[*S$eWګ[͗uT + 9h[40JMb<%|8;*W냝gw.Χ GaJ,@UCkg_{=XwŬY 8HKK8_«-_. z5.ڙKz_bM\MAFJ"bb [Z(l*ǕMsnHK]]۵ ZL.撓:uCz0$lqi]!psZ-y)>J?
oW{og
qI]Vt `ރMhmނDwݝ/~.U<[.JWic(P.e<܍>qIʹEw0 >=Ru<{JuB
P (@
Pφ2[^{=bۄtd%#!.1IvHêm}D|N785mx{! Y/O#zNw^<~U*ε>q8=>+@
s0= c ! {,ġSthm`dfy z{aj2y[|: dw
1GIԌ WuUb(d9r kmօ$~K÷ Z>B?y?G|?`hCG>mٴ
.I}Zy w9#Z7LS=1Ks.:u߄kҏ@\j[r0ubn5k;{>5ccO T'S_/9a$ODDGCk[HK|sQ[t% -+
.r.#;uтQ"+"?z.' p<?J^Qw1Bx.Q呚D|xﾜZ5~җ2{JL ϳ׆G)@
P (@
P FUҏ-Č ԌSļP
r_UO܇jLc`כWԱvp>qn{;,}q \EgȊzg\=|Z,gnj7Qe ;9x9u.ͺGvΩt'S3=CAl8sgnGI`ꇿ{i3M f5/N}h 6/Da1ިrb &L`/\ 'O~ @/&\W +VatY]=UP_G[ xMyb(uM*|p<SP扉Yt)GXKx~~6Ț4$k* vQs1mω@4SVV#(S}cxNζc
~öybxb<í2=8"T~_njCqcݬ j~CT^ZYK,̖ (@
P*zJPݭ
~[汋GRZԙ\n__ҹ3yo(F7 aMBfbg91ZKP($DX0|0j,|VCM
Ӊ^~s~hqIWU~-F6 ݰh4ӳ0.ɳ,9qfN po4\ąKb-?!koՙ_U @'@r 'z%K'誽rʻMIMž\%b7e* D2Tu%Vy?W #3Aiǽq( %ZKHFV"65v (waޡ+S\\ vcj( %JP+H+ BU$Z~t9[_\c^?z:%qwuR
P (@
Px J"M1 ӕk.{ 6AUFH5<xSWi,}v~ ėcA+5{ߘ[k#-Q)HJCZf2l c
Q:: 撴bZK6WQA,}~|Ũxb98-m!8X](Ns3K-ix\
IFmyhR1 BRt\<VуF^"!N/C[8y1H'i*c9 #JcZx$ %8%u ];>l-Mvɺf=73RP"쟗%je1P9(}v=%+zڭEҴ.9U" #=O ~>f%0 鯜2v d xKl&0LB1afBCQ9ɩ' a/[ R!+ i[ f顩oTKqpvߙlQ|%sO~ٓug^ (@
P (
DʼqJo)o~*mʝ wߋRf"@zWR'ļt[0ԝjKq#, Qb uo 2}; jR=D _`ҝTWj/)p U7R =Sz79ڻK.JBrS?FGC;a\b *ҕmgIC IU:soO.>ƄRPD ywT!^QyM0{lOq.`k?? ^rX_f~g??
lMqls>#PbRORPzӍbdȸӳoJu-U::aguV1~?'mZ6^NHq|ӒꭞC(ղb+h@9 l_^?Ԝ#vÛFݣ[ [5fآ|CW"VXlgdm>W]1nCEqa흚!FpZ9 <ܯ9 (@
P (@
S! ) {V+v-Rzә{: Uwޗ.E J\Ko~.bjEOz8\jVWڍ6 ܼWNph-?%? )珏*$ր3->}J[mnRJwP/0/ߌ&!:ڃ[ׯMWԲ؝GI{y⤊[ZpI im547[w4Xzp$y -a ߜH]g;%z |&{{ބHD|ijGo4 W !HG^RaܾibͰG(Lg<[9vTD~s ڻ0.X,'aoCRӉ'ཟD@[\]oFܘ }u
h,A ɊŞ n}!!)=9 /ܹ(맧kCw:ރv,B-"Y"j<|WwS_܋rPڻ:? %HT1Y<Q^WE\HFNrw$Ԋ{8ķVؿ9ТRĐ{ 8<;ұ-zq w M/@?pND$`+/k_(>: ٌYWzϩ^ 8i_I(@
P (@
Po¦{t|Mh5cL~\^x楯ޯ.}s=ҒEOfkA)\kDEw/LcpD-czplrͦALCzv *- ksׂ12Kh[95ګQ )w Wuy aCzx뚜[ׯ/1OS[ax?Y7#Y :WM;&bﴵbn6 1[گp*1 Bmm=z'a w<a[_ CF>[ݤs0ӯE/"Y -Q`PFǕK$=hҲj5kLP`}KlƩHS|- YEaMǺpy- %4t5ԲtN;s-h:S<n ?s/D C^;Z HKV)ChI\BAH¹ZI.ɳ X$zHnEAŹ +W-ON~lTm.ײԠҮNv?>uQyvT =7cK eC.G!N
otĭHl5B='aH%4H.\<+NROJ+{O7>+S (@
P3#v/R: ?ޓoK R"3 _~yJ{;RNYU |_soR32g1HP%}UG nXc{w Wpoq'Ee/ }C
WpIVɺЊ;K-_XTq>35_<ֺ8;/>wkYXLm@5IoQiR6tЋODj.-GR78jomPwW]? obd@/ZohNʪSoHeRՙ}$kTSjiW)"ˀp_vhJ7ؓGcoK01!V9.O&.v<(mObⱚ *|۽m[ý8Ňtv| Նul>_ =+~IhwZE{e|OQ5 xDSe f[ ' _'xv7![pM tb#=}]L?rݵY J = /~} W6;EsZ:XT]]yP)XPuWGp-̢g? / \/q<)tԧWU`&> h;Ӎz<>M>y0'eQ*{lzGsb=ڏsG?3Uh[78ԏf\=il1\,3Ə1wlR=ϝ܍k<W)@
P (@
P ?~HA F)w!v\ I4tȌ|!])3U5x
,}>֕\'MO}O.<PwKS ~sw:z1 Egm\:9V__o7<SݥZl6_ ﶭ'qWylݭ w>?dض"q Ʌ6yI%k`eC}y->^p~7Ȯ&mh#* 5B7>_رkς4$ taA<U|G^ZL>z@<'^𪸨oNf|
V8Ħ -n=EW`ŊX[>=ψ+>Z{4_o[{ť PVcb]=[XdEab]Wy}9K <ޮPQx[]
rs9"k0-X-?` G1{5< W~mX\b KVS]m (@
P \Ci ܸ!fff e}k16>vY HFjM|vxv.L7^tnbOޯ.O
R; 7maQiw>~k7*\#`eƮ&g01X訡OSW D-1 =swx#~On ؿGp9'~cs (Ud,M҅tCh?߄:ܖy g롨F(~AH=ܩҮۇ `M4t I9dT,_m2jB
P (@
P F&{.J|:44cy+Mė!\+ʛr1ʓr\?=m?z_,%j5z7ǝFK-h ҉,00 oQ,? ZDpis9uUQ?^uZy7` |j聺SL
POРC:jT>a nvޛf\ ČLehs
v}55 (@
P (@
%drֆ#&&F O[!T
ن4n9;3yrO 뾔0B1Rb
F hfHAI67@s;Z7>GtAbQq ၡb,ul@3uc=#ӦN \/=Z
$U% -p鿅o N
P (@
P,0-
}aȐ{I<Hja)+ {1_ #CJ_vl2ݓ+g p/ N
,kdlRF ףGdN$:p$Ĉx(,jvW?> \d&D8%74oo9 P (@
P 5Gܤ`X/x߉Ç0ؓWey.d-Z3[. FQ^RHJpV Νf8s W*<Eݙ Sk˟Wcp^رk6 )R? ɂi(@EX0L?+Ej(}1)"7S (@
P*0>6{ Wdih@1G /no ^
(㲼xxG#.j-&!!h4-`N3U9Q`rb <Å (@
P (@cixCؘAMnP/ .<C- K (@
P (@
P (@
PB[P (@
P (@
P (@
PMdr
P (@
P (@
P (@
,D1
(@
P (@
P (@
P Xfz&_E(ER (@
P (@
P (@
xR=<ɼ(@
P (@
P (@
P (0G#R8M:W(@
P (@
P ,kJ
PW*2yϖ9S (@
P (@
P (@_pK_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B:_(
P (@
P (@
P (@
80P M
P (@
P (@
P (@
B`/
q,cdxq)
DDF6> O @ IDAT \in (@
P (@
P (@;(@
P (@
P (@
P |# uJ!~c7,
WK֬ݚS;-kP (@
P (@
< >
)
U~R>췑- (@
P (@
P (@
P`> 鿡 ݼ,s (Q+ .<?|n63 ]9 (@
P (@
P8G͘ (@
P (@
P (@
Pn 0P6!3 (@
P (@
P (@
PSP (@
P (@
P (@
Pm&p!!ZL ]L6 (@
P (@
P (| \OICdH3xh w1 .۳c] 0
ͻr
4ɖ"Ց>>fA (@
P (@
P (@
@`YҋmCXv U[`2:o܈ lKKHt (i{v?y/?O
P (@
P (@
PxI.<#| \5옘8mvA `lRe1{tax}k,VAϵz|h,lkϳwP (@
P (@
P (A.^ފdi@H2vw10~A!HLBVn *oC͠`?"Iƃ~|~
φF?Faoh_kl F:5/ ǀ(@
P (@
P (@
PXK>P_kl_Fb6p`[ Z5.y4ꮎ^ 9fT]uIk3:9ڶ1yr8L)@Thm ?
}G J13 5'q&\> (@
P (@
P ( hѣ%eis[s_fmI\qɩW] r6+N<zL=4@gC8/=3 QA\!2%0Ւ¢#1hWf8mP3Dřդ@H6D!bu63 1DfO mbL5It՜BQ$grV]UqN8g%12!
ZJ * pY$FQ2bs:f N>F`R |{}HeQi3
G5M\ TuHN*> `/mxz^xg" : =< (@
P (@
Pt.,;F=@U rVTN1"r1'Jā\$)d* g,4_o]ըLTyL&e0F鹤n|{]oBS"YY:o'ڭ"up>x~Ql,mq.ǶBݨGw@vʩqj2>=
'6_#eιxԹv:CKǸ KQl5Fyq?*/T- }6 eiR}Ml}b\_k-(}TRpdn?i858J&j6==eߔrY >aY ?ů뵓K \(@
P (@
P (@
x_`I\
XQ;N=l[ ѺJ*7.-a~Ra
9n"kc1~!z}|Ůӏn-DvxC4=Ҧ]hfR Jߺq~qjΖXe_zt> VrzF=~EwΊs۟^iNlMN+V[QWNEX zs *O,>u}[=a[Ȑҋ7$";I&- PclKgzu_Jx;%1W
P (@
P (@
PV% кmuu٬%`>H` pKQ*u]tЂ|eQ{[8`=
E\[@d}6e 1>XjԠ&ojkcc\NV.A{U fD'`SI5+[*/~Lf:͘Z 1<oHv4
Cc[K3/-h:h&zd5[U 1礮G-u]' I,mn?:c7Tߥ @b. x ;/ ǝN-u?(@
P (@
P (@
x@`IE8O,[dt t
m Μ v ʷżx5"Pcip^ !.*tnNVXwҜvQJ313
R7
rnx[Z |%~DYpEiQ
oR{mF7|fR!hnTOkW볨W|߭F _-~IB7S1o߿Zj=?)DԮGMn[ C^i#`P9`
5ha)Z`] '-s:H#)*g`<#cS|V >qM. RP"Z0&% ֹ4=^,
XZqV'' /-k':Q`rRx-zXwxB:ŷ06ҳۮfhgub49ҷ/2 (@
P (@
P T]DI -N ֭v5ȥo&@ [ h B` Z{F@RyFa|%ƟH'j1rKZ5g{ & ȹm|xuwF1":ja9"[)^X
/ڈBqN)|
j6b&1 @Ω}0VbO9\G)9}f$c㑝rkwu<Itj];JQy4t9g o S{oe܋b7!>hR[4_rjjULW ,@]X^= %ꍤ+fDEY3}}5WoO#Փ,B)_3Θ)(<v*Wgk\#\
2Csp ;oVwW)@
P (@
P (@Exu+h#6cU -$JMwi+ [ո=Q됚NCL {wcJn<BQ 5+/>W!td ;|۽6$HMbh%`z2_@FV-H%Akp>C`/N̝oݝN"m^mGb(,ǣ#x EVo-絥3X݆![ͪbHD -&1 q ~ en)SRVG,+cO1 gޞvynj={t!/ain 皎w~xb%8X])H.(3B
P (@
P (@
,-% x©=\Q GL2\##ܽ/1ދl+A/YwFI:V=& PA:sΜMiC1$[=WKdV^,kǧWt̢Kh/& LƖ (I~, ]{ *kzBקyCɎ h3gi4vsW#53ELv.M^KIwjS1> y.H75)8rێ2$(ޓƳMzGmB>H7܌S.RS/S
.[kXySryq YQ ҉gxC!`˷`ڬ
؝Rsb (@
P (@
P
ybDpBֲrk.&88t^>gjy9]DW` B 5>[-(ٿ<x3x<+-;Gi1'=HV2Ö(Z&?_~/oXPP"Pm;'osߏhFw~ {BIL[_ߨsG |]HɃQXƋmJrKŧNˁ:LOCR,+=NmCk[3. N5L0!:$GnŗgDӰXO0^9к÷z ]^[Մϴ1v9r5xWySB qT;TP (@
P (@
Pgh0 5XlZn\)ܶQӴEl$ p`D猗@1ziWкA< CffgĘZzdz6 }9 ñ+-sa1q}QHO>l]%|YNeGLR\RS#hԽ8s憋k |3*jA:59L^qxn] 1C[C lDyK~Ұ
j3.댃t7ߋ D7k=HNl6ܨlxTV^Sjm<.<_yb2Pɣֿz@
P (@
P (@
~ߒY jƭTplJGYzԄ`DX/ʛo}3O?HIƥA6Fy@ȕs #6 p:998l) e.K
zF9{H~8}u~[ȱ?dLvXE A>NǫTbd~11r z] :ϝ+? I/|%?S#
1ߙ6Rwzm] b&4w` R?xy<2G7 PX<
Sb B@O2p\_^q8Mg-h =VQ~ {]jvKf=WS<`?硧\oO7LM=9 +B
P (@
P (@
ץaƍ;+W/2# ?1c4[H4^ڗ0փ;wڻQl
JlF(*;z@nˀ ,r9索چQ.v}/η9ppȨvS$1^Ne=Kf.Dn-bxK%5!⁽ND hQ9SZ'
jǞܯStO"* ZxDY
{
EE*aZb+R$F/+5ĜhJ9%.ؕ\P
ébDGzncHUolGI[_j^ZԢ]2yƦ}o`wY_>GD(w)MaB\
˸p%`$f?=f\/+x P (@
P (@
PNK<P'\X1ǎYezTC1V,"cҹ mĭdg^ᝈL" dg I
ǖшXۂIebzfuVwqݩH
ێ[} fM?1"rHvD2Ftk#PPB{432*q}^_ :@XWߘ9h<`)i7έe 7 ,bF:I>.[ ń;$o[f<t>gIB[nD2eՐnavi>.s[x@;(S<)q}'0Yk2aXi>jמ hw Zsc,/
qQH_pdn@fl>qth(@
P (@
P (|xozxД뢰yq\S7;z .D<<d 6d# 7pko\dyZ\d[DqM8"`0h">BJ- &R)]=?ޝq @ C}!p ;)LS-ɲNؾ7ʗᾪT[KիTnRNb+"۲%kgHS$A$b_Ģwg̊!] NOwק{}@>s9'oGӞ,0WnXl:&M Wkha5O19(Okv{86rE$I
( h9. <1:shVbվG!<\ix谒HܨW4S*{ Wi3( G<P,HAzV"mLGyuGk˒^N8P<˳k.hVvm=g3LIh H*6 aF"eRbwM\:*+JX1[8%^hDzZ2r PcPm;Ц>s (@
P (@
P j]q/YeE:C]]8vm;~˸ܤ X}|y,>57P}Ça$̉FIx#KE;]4̋$1=q؈
g
__?~z65~]j9,qϢ kU4eG/s6~w#K:ź>ѐh7p~qi*;hSM9\n)ۨQev/pTڄlCtpv g xdH-/:Sj
3Q )یbTp3M˄/Ȃ\ *k7 Tj#CRj
+vdJ ݍ8in8gˆ\S㑨αZhi#e=٦N ݸgk8
K\bF^r-I 4a v-s =uBRb",9hǝWѻoC$q (@
P (@
PXUǮEj'vGvsHZTu
Dֱ
Wphl s ֛j>
4_ki(^ƻ4ىwSwH+CwxN:M,4%yYīٹb;!k018>K֑+Cz$!2h^<Am
f'E#-j~_>ixO; E,?nROۿW ܺۄC>/mClTÜiG])M--8cjܵ0F ;K t^ =r ̭p ]VCҚ2aGM?^k vc<S"ƍSw7>BK.d@eUӋ{."G bp_ 8ѸӥɘX+J-ޯ4tawiᘼɱ|tZ|گOWeS|_PoX)6#= T:+ >oqsCq
(@
P (@
P (Mj3ALQQ)6+܉hu&oO67-XOR|bm;Lk{zf:zD ~eW*P2SRo
F\ۀiGfDqqUCKlFjXoW~j
Mg od(DەVY+
/ -[`]e}9< !qϣ,JW204ҙ -v ۢ]fK.=)!a&0T5`hvPs0͓<9n>sn֧=a_fgZ.̺ > Oeq*!.u8[=x0&z!m4c.4E(/L7b
/R (@
P (@
P>:Y,q/K+ ݶAOaHܫdlɴ< ->-^ ?ʔ%(?$^v2x|d| I Qdm,߾:k.]ZpӋ{}qG/Fcnñَ?/? y}4w DNm__g:%wcxxQSZގƯ-Xbk ngͽEQr,[ٛ;zv-}ah*m"T[5nO%wd\,U `!Fn`:ɎWnu8q={22s{ƣteᾚEoǰv\B
P (@
P (@
@P1｝̴daaaZ/
j)q<Gq9XHD$RӒPDb['t{X6j
,Θ*ǁt<7
E!>= bjŅ. ]BF!W-G{ṗ8sSyʚu#:X쳨PSC_q! Rܣhh C8փ{>! dHi||IyX2:1f1mM|V_ek^4e@:t7Yԃ&tN#:&a!Dų$EC'A=ll3֚Yѫl4&'1<WH((GNTZ}]4](&玫
ȗzF&cp~ n4HaaJ 8rM[Z. (@
P (@
P {7f c).> ze#lTlJC^m wqz'g¿H!8Pr' PH
¤h [/kDo4w;X#RPIGD`nl@552:$c6D[݄x '釆bb> ϊY]Ҍ\;+x 1
;:1Q~VÁ;7y8!Ϳᢽ *w+{;e. G sJDFѻzV ǡhgS˸q(@
P (@
P P6Ƹ0M?Dp:qe
=cX'#˫PdXH*~q;xWai ]Ə՜jg"z+J5,ky* (@
P (@
P>.P&#c^(@
@>˳2
%ޟ/ GF~YMF*7ӡ7u7(@
P (@
P _
uC
P_eCr^S[t;8s*.\"@% H
P (@
P (@'K
uOfi)@
,|C9ޏ=ۊű>ܮƹnyI?X^ (@
P (@
P
nY (@@W+^щ)HN$#"QԵh7tuR (@
P (@
P1`Cc3Y
P%06ɳt'c (@
P (@
P <or Zo"-8ء0܈HZ 1=6
8C
8$=x\i5|L A
P (@
P (@C WG R.`u S#q3 +Q2"
P (@
P (@
P@H r<PC!'d\xx<=ѻ (@
P (@
P (@?PVS?`(@
P (@
P (@
P (X
ܭ,(@
P (@
P (@
P 84T (@
P (@
P (@
PqQ^bx
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P lsA(@
P (@
P (@
P ( dx
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P lsA(@
P (@
P (@
P ( dx
P (@
P (@
P (@
: (@
P (@
P (@
P
u7 (@ f{/rL
P (@
P (@
P '榎G#J܆ (@
P (@
P (@
P `:2:
P*Pe (@
P (@
P#Fzꩧ X} 9R,؆
u~
P (@
P (@
P (8.6&
kIj ߃ߓ1 (@
P (@
P (@
PzDc ,^l33zzz_`9CþҊ鳡nE"n@
P (@
P (@
P (['7/p|&&aHLa9}L] P (@
P (@
P (@
8* =NffgNʓԳozfF?
u~s5
P (@
P (@
P (ԓNk )
?
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P lsA(@
P (@
P (@
P ( #S LQ%DS |-7ӧ3<N (@
PǼ|/m.eʨb| 6To5Uϳ PE { abHY/-+Wk.aʊ , 3wqqRg:ڂ#G!"(37pB'b
8y['%6%G`qy -~'$; G#5(ΩaZ&Gѩ+tuB??<_`cbo:Yjĉghb ݍp6"_l;N|4)@
P (UnK?RG`t_ ^hq<
_ 1t
9q3F:im|a/r@[X #EfFg"K(@
X6fdʍtҒ\'|Azo+^VLJ$ >DD");"f ^={˽ G݈c|
uyd;l=rEň[2M.,t$폫r p?fqRm٪>o̽[^j6ƶH?*T6!cJGwa[B0 Z
4&{twy#P (@
B`ꀐu7_T4PHS70Ojm|5,ϻ% s#G>^% (@"sv }*. p$iq
:Sl6FI<Ԍ`<% EgHyRW+iLǞ~REeͩODdí5uWeC+,ވ#F$ {ZV)yyj G#D :{.{l7PwQVL10n9,^Ỹ8̶X '!7H =[oڗDMݍ (@
P"
uʅ'tPR|]5+b\V+$ʝ_!b6Ajy2rE
P! CE WM gN#l6_^輱wmNG">V3+*!N
Pp| 矷jA{kF& 2SBa ߇O/~X[0۪$,{{[eo?QmjԔ9Յf M`Mx"3f?~o '
]-;&քGLr:AXr)Y:bO w[f (@
PP4Ӆ%8Qҳ
U4
7>W~W%aP
PpM`nrIgqAg$D{9ҍY{հn?SO2Jc{~Lpʲʯ>D "S'cQ RECiBU"TiCCsA-U#H%|Ih.`߱0ȁӰ^8}2U8NoRl8-51(=F~Õ/?S (@
<>o nl+ ;e%aChֈ;f1ہk5:1$"8Ś.4w+]4yaqmX[\hnщEQ(ھ ).b0jnMɎQ:W~Ki9%NKBx0(Z+e9We(rpb ]uסtm!.ҩAL'D+˄qQ>vWoܜvH{D>y76&b E{Yʔ;VȄ|$ǮEh E^ķ@5ա+m˕_VHQ5WI
ޣ Ge@X.}N =2ek±8ރk7m/(PQr,{ō[rXrXuXcG[qV;6~ytoϦjnTV[E#;5kFS}}i.[B6
Wޒ}Y/ɺ.zЯGJS7mQ?a5WO_Wܖ/k[91a(q#xcAGX>Ѭy2Z֯nw>GoΐQ~>nM#
dhj,NAS#'OtK <.
&>Gn.BP c>(swm'Ug@QDD4)Cj9N_Z?9VnZ&DvKWB6*0ߊ*g9{q83_崢[ۨ$ [pT Zzs4VF'Wl6: \D
P (
i%3&1W)n"J
:@F-to{oWΝz چ <AH7}59XR q|<_w! ۳w4EͰ9]ؽg>w4+ z.؍ DC ڇޙ[W/ŜZ<cQt\Ɨ }ᢍ%Q!sculr+
, O :4LفqKMqO^
@/q+p2y{WI҆O< E~6 DqY rY{c
`Ҷ=mϭ'DC1*NSʍ@^5㦆:hvQySL=
e# pM_!!~7n1Z6ϕ܁kg?Z*sv ޥ(;4n6 CO& >zse;q;Vu\,Jawlg(o *eC)]|Gˍ
x#98z@_Ucz?S_aOU SU7}z;=c<Yf5~ct?ZX6oi}"\^J_;;c%Kv߃U d)!i7?N:>z4tuQ۵X({
i<dg jOk]rljzwb{i w.7)INܽe,IDBpTV{{ޥHeEa&S{M<9NdWڞ_k _':֨HiIyR}I{MEP|
OXn>vi-)@
P V]t3j'+yMMMoR
)FCPjٛ?w4ҙ7O"mpqZJEEi3)zPƽ|gW̱hs +b_u#fHIf˯[
𭗿۷l8KG
P/ൗLD E~X47^oSe |iYr (gm#iDl;SNPtOߤ|t.- Nrˬ餍?=j̡g1XfH'o.7sϱ_stZ\ 7ˁt vL9 K*u&L=
[W®pp_w7YKH4@4kh$[Z7RY+g~SDzHMvnwO+9ܰ~뎛6}G罝qq\ΜA8Gݒf7g)" _nR]zX͢foh̟7M߿]z:jK.PVIכOIS ݕzjGv皟6Uttt7AF}[m<m ywҋ:ބ*wi"1<&>}mzYɇU=N#)ҳݎ~Vg~q"Ş^#Fq3NZ0'=z
Sk
!-q[yw;U)!)@
P W7=$vnbq12<%;R|/ݥ9j{w?^%MQRf *ĝyʢ QwR}Pjw`^)zT:Ǯ
(17l*|z{xMqj$Z X!: C <ԌS
Z=[M(iLĖ=;Pl qNZ%&WA A'٘ zR"(@7`׳b D4ւk/^\L M[EOE^ .4JW*c
cMza %;a9\la.oi!%9} ΊÈZ 5
&.r^ *ke{F4qgA<DZ~B. Ut +<MwS_yG.zHiLWˣLuk|z<d:;՝Í7⢔hq r$(w7?hoK)J3[{M=r
07fxg~9 ePޅҋ_}y
lQ>H4;ylKR/{o5: <>[E1כMQҪ!A*Gr6FWiT $#[TsӔrzcCZLؼIt˥F\r:
WsnvbXϣ{X&up16[V3˻^w+gf[:1 7Q/J"~@Xc67 MKܯEyv]}g0扛$n:]'u\ޭR~'SsDmMQ4bi Vq/ j4
p2UQH>
wGfimR:5Rs9aM&/ǥP؉W_ 5w 989_ ;=_Sch
P (@ n մT4I h[m(,4.¬mܣ uvϪ
'4
~u7Q(<e|;T @ IDATR4ﾉ@-8I ByVV:{h2-ŝ pG^Sय़b)p䊆Je w !ThSJP}3t0Wbg17pEh3Ҿ.6ҩ{3q.*-HOPj\{ /
uW`_^TP
>M֤=,^bؽCahoL] h$-T}o}[\VAZ8Glogșu?W+{.㑚L v\R73"ߟ
k8s|pFr s @ tx܀fظDp]]Xi䣥$ X&k=oܫϽ۟5ϝlƳ? _柂|\mջPbR ĸts$h 3R
3Ci\=*>n5%~'gݔ}feo+ԟz/QolG f^1ʲ/&ZKˣ}\ʟ|Ttr"WxB v/,>xkoz;>DS =>ez,9I6֙~ Ѱ]t"-w\>,ͫ-Bȝn>E{ʗ%yD#C枒¤_͓˿GM曖IJw ߡ ;Y_~{H7M'ܯR;=_q (@
P75>`L߫Fru7=jrCQu4ԣ,v>~O5tJDcELeLeMw5tm"(dPWyHʕ+"zZ\ʆ/ԺZk[V%mg>į~ -s5 ğY wᄃ߳$9
P!h%[ޫ=OqU;wqoUK(
(HJGrv#1FmSVM
BjQ
EQXjyMXjaI/ oHq-M#FER?<W>ܖ~@jLQKbf(Y\4<oiS#Zwf1>=ӫ.hiCKKWrMMN8{ñz P-cHm.=OWgݔvzI/ӽ F:e[1.g\x<w|yKzr~~gx??FSΈH݊#8X.<$qsYѪ~ߏ]xFv:owry^[uӳNɳx\iq_Ϭ{. )iFc}ߡo9AQ @x8~U
P (@kZ `\ QY24X4K(W.f|{
RPb܈p 4x BB Al<D^s j :rJS zZ9j.p:DVӅ xoփ~twݺ9qW˖+)@6`zq<U:j\>SYnnMhk8nyQۦIR?7Q ]q.%fy k1ա{I;ɽ8Ĺ %qD#?={u]:[*S642| G]/iR%).Bݵŧy,&j;u\]j07Eol9SZ4N -)ai9u\8pʝTU8>4E2&l9#bHw?p'j7׳nzű^BN(_'1 jA6 _zU&]Wg{D/^Ǖ|def1#br|
D~.u: -ܯy
=@s Aסbܼ Qs%}9˵Zjgc|;XӒ՟ ]bTV%
O܇ód [Ąt_ʃsWg}=(@
PNJ)wbP"Ux.͇<+
u31t*;2*\p^z ލɕ՜Ɖh ۩4#5S<+BL..h5D\)P X3?x [\TQ%#qxfs1Zg;ogֶ3~浱W>} Ŗ z<u<Yg'ԧo9"?#?N>C)P Gcq\ 4bcU0?8Ő=m| -\yk5/7w+wݼcapW<J^XgU=X Ǘ/݊Dn0ӈ˼!{ 7"CZxkM5n;}֝q|ir|jk]lF5x)i<ia<n ZθR.5^|ޚ5ړ6j͇SyacKoxÐ8|ӍوSI+"1%C,{R:2<(@
PpUￓpvU `ճoۀ =(oĝ V4 j5RӝEcSScCYE#3|Uj+ ϶@)?^6*BJr"RNbC(Цɫ4QpX
!VJv(xC[FwU2gJ$D?Y.
=Y#] 2U60p ͈X%/ L#]xdaAP:,bʼ~xVW#RϝBO0؆
@ɢyk|gG6?]LͰ6: <_ݪV?»ϢzwZ<ĝ;Y2jH{4$gej$n $L=/Sh" OF28'nBD;VTw1~q[kukr1 n
Bߧ.a=Z:,wut/S=@߯Q`, (@
<b'zq26)HQ.ꤿ};9wpf\T=[4u\ƅ+lHm=']/RGϸH4udݻS%M"Cҳr PczƏm;жs K
8&`9' uH`)
qmD^ eޟszr.v q)21 @szWa-ǨWw7~Auىj^k<?E~,@w[FC&oGzY rj;
cn PApm]ڋ|1V/>Bo O𝌊?/y6ڒ[}~us4l)=3&;5JUBwaNFH$>Dv
Doړ"E~ 2NS)Ƭ 7PFgN3m'#~s{7u'˥ɿWl̬r{x1[ =4 $7o|dY=$ċk ,cpܟvJ<]蕇3ζ vyZ)?)@
PoSrr%\w_A}C6^zqڨ\Wo5M~횉J'Zhi# =Y&/_]Xn7 //FZNò$ݮhq|zX\ߨ (@
^@GiAFv2/W8wئJ86OZ3lFQ@"FC-ۚ`h[dCn.5]m,^~F%%s)j2O6q[ Ky^&#urggKIA!Cթ
CCOQiH0ݮNFgpR:
byjZZZ #铧0hʘ_^ گvvzx0y2_ %>U͟ *.O| gU*^DšElŵ WpuXi/zl=݂"e>K|y;+^f|Bɩ
WDJ=lRZH3W!6I 4VC'Đb}Խ[^dOLwی}8|T]8utypFը : (@
PpX?Dvkk͙FF':Qw[{7NWjH-X+4DZ,CnߋJމg@~H -˟~_3˴JόOj8S]Gc^Fq2'7
Pmv5öCؿY9*b7]i92{;,bg+8xph UjwލK?^}(ͰΗsj}K(Kʟ
$寠4WIW_VA|mQYzN؎[MũmͬU]:m= g?ǫuq=M6$gO7j5s#X"L` KosT f܋giZexl:_Wu,~ϓj"ugܫKcsW|X0l>_HᳶEsvz p
,!sP&H{۠9\6u>-;{Q])bt{ڒsz5x7dDmo xMՠitf'3U 6!(>+W%4
Q5wpyukWg}zQ (@R`ٛVPo 4^jP=B.DO
q9x~CUf>.
%;7Cj˪y $(?Sf\FS(BSTxEs`ua)u3r{ N4v3}M Ev~ !Ep}sJ1 5h )@.vVlA鱿AT9u 8j#2
6#-> _*IS+!V%G&8<s
nQGCGmǎCRi0vI5"UP/ hyXǫxb&XW[͘mF%aQB-=07؊QjY4
k1"gD~YP R4Rjih?"'M)sMxwJj}b&}ݖA%2_ U L\ eYJ .WO<_vz9
kкYOdhϓaw\iqJѼ[5Qyd֫^>wvqVؿkjP,Ry8jqE#=yF
!H;9{|ˍ43t~mooΧ9щh=Xn:s k ͒r^BO} -T EGDa!aHHBnQՍ W/ݜ5O~)WaMgk)0?[H ~b,ABoWo鰕'iu#Z'QgVCZ< (@
<P QЎ]F3k,w C$t 7oA^s(?40XI{aZ>O?9מCa2dru:]͉t9G
g(xk|`i1u5 ֭4(:wv 8C
xNg?}FyƸ mSw*gu!N`w!Mme M>%V:J jևˍvǥŮ
/"iݢܚ)Kv9ʧnmՏX8sR Q^b8T>TW\ǫ])~|hO!" EymҪNѫe6i[iZ҇Ѽ Vy0.;|&bczx0.UeU/u֙뮛zcotią:WΓx0
l + vꕛ_=e+:$| '
h57ՂN~fiUnL 9>W y7a 2M@;jۈ^d7RD/j7w\n윇zy %ù^!EKo6Z Wܬ!t3 +ӥp]G{ĚW_ƶlscxxt{%(M7uKb`,PnTۂ?@M _J~˔[ U (@
P~+fs65kFD/Q׀[5Gs0 y~=ĖL}mSP 7 S9(!, Mm(Gfհno3?p ?obMvў&-wAfՔwW&0P;}kJLﮆh@ S'
PYʺՃz\_qҒ i=9҇ӗjmωGmC0D=|d jW YNwڬ<'#bi3ojy >9^ooQR2:i)߂{EY-=3_UbPҬ l*[ ,4Zs-ߋ ymL}|xza- dg~1_<Ko]R ?
]hFDvM|Ufyv\<oݲՖiuƶnb:2WY}O52JDMV8N\ݯJһKW
Ǖ]nz+8JO|h+i4M >\ol?1'k^B}YgN[o+o;!{Ǽ4oh>em']?s\:> _RNӸ$hպh䴳5Zsol\e8GF.K
Nbomw_\vf6.<7ʽb=Y{h;^#GS.j'.shm`xuz~CLb-yd;Lb Ji3sKVswS (@
S{ f
ws#5m7Ҍ\;9q;,:*EbȮIbf>ں]ʝJDF1ϬN#h^9{st D'O 7[.tCtdbarA8)"zӋW." c}hi" e|;UhĉǬ{Q"CkxH H)!; =>q# 5dlB^]}g 4ρ TQ-yjGvzHLJvfzӋG$AqϑRЋ^>wJ|LGFaDWqGКELnqzrs 2b%HzdoB\L81jcc7;NʘG[B-L0ȣ(<;, p?^\-*5]{3_)@
P,)7DdUFmdNf=IB8x @x9=pK`-j8p W-=kYқq}ö礏bIvPgj=y` د.vrz ?k/Yɨ|Z9>ӈ
^A\./k]2ׇ⥛ =fq_L1WxfF: _|s (@
PcPg\A
P (@
P_
`P<S6A]V Q([70aHۄMij<sV]
P (@
jw1 (AAjCVjڜK.1w>Nk ۫OVy_ŲAXr![KB
P (@
m1 (p}M{wN<M pgl'{w?Nk ۫OVW -[h1vẝg
P (@
}1 (=7qN8Q Xr|Y ۅZ.U_yȄt$&barAZ:O " (@
PPiQG
P (@
P[^(@
P ( A9 f(@
P (@
P (@
P$)S7}P (@
P (@
P (@
P#0? gf}hdʜz
L{4w[!}T)@
P (@
P (@
P
>|EERB<ffgn+F:xf
h
uϴ(@
P (@
P (@
P ,(FF-7Gx9E碗z =۷ܚO
r}. (@
P (@
P ('# !t:]OCt|RM((@
P (@
P (@
PlgL`ǹgCw (@Csr (@
P (@
P X`M Y (@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
.`w 3N
P (@
P (@
P (l ǼS (@
P (@
P (@
v1 (@
P (@
P (@
P,@{;(@
P (@
P (@
P@
3 ',"(@
P (@
P (
-̀#{bf)@
P (@
P (@
P {\$A
<S, (@
P (@
P Z_O=B ko" =ã9f
uZ
Sca8w(@
P (@
P (8
L+X4D!x55IuãcXXXͻ?-?=a^(@
P (@
P (@
P tq1X6 ,l^}a#$$Xаbl[P (@
P (@
P (@
(ɍt 7|I:iXN |1 (@
P (@
P (@
P
HϤYj$웞1
)
u?
P (@
P (@
P (ԓNˣ )
?
P (@
P (@
P (@
: (@
P (@
P (@
P
]A (@
P (@
P (@
P A(@
P (@
P (@
P ('±'ݎß"`:KT"<# (@
P (@
P (@
P {y_J,v
_?颿d (֑M\S}wS>-R<~ro?.~ao{j := "06)`3 y:t: NrC
P (@
P< "YRxt
Bh<G9aݔ`n >~Y0EGm=KY)Dc~s▃ac4cH'60 eQ9yg.)@_ wagZ!88ss3C۽&|]nQ /tĉ2=lr'}?En~a@/{{vr[X/-8 $iUW/V
9;X:h}hq\4ZϾN*3@
P (@
PUk h>yƣ(x4,&'oTܦkj3 Yp).1#M4u>.&HgBF w#t<:Ƨ7{lr89=mY6 lxp#L%.J@OaCZ&l/ms'Q}_ˀ[*'͙;(\Yoٍ`t8wh{`?9Z>G[ͪ0SCI~v]aojŴ<W"煗'G AK-W
_|uxm`ֱ`Ĉ^zoaJuE (@
P (wo<?~X:עsӥQy}W#r3S-4cu!5~Jϡf?4f:Cdt,RM%=\;'BlBhۈ(@
,#Sw'f8H'5!ݘ^
X߈S ˺a5 g _$Ǚ.χu|nZIJV~ ~ۖ n5δT}K߱ߪnw?#F_0YeGs#i6ҍwZLA榭؞(oT<Kzu:}mQ8O
P (@
P7U6ڦNٹ
ucvD rtG
p%8QsNlm4)KтR₸E\wl{nʅ
xKGaON)I7vEҍqQ >>t|nz2qؘєzvttt9SZY3-Yjbζ{U+O}V̔g"gFݴTm;6!I 1ނ~ڐV#H f#O45) (@
P (@
HgUݾc ;wbkim*6]-8R I1=
En}4FwKˊsr[<ʀ~|Ҵ]ȵ5Q(^hH=N4`m5h۱/Eʼn'j0Cs,݂ð0z _߱S;:1X/ *-#Ƨ" E">̌u[/C?Jk/"]"2%<n0߁+[-_ZN P]" 135JBq (*kMZ]Ez}T| a]0֬'Y uV^8$ɞю!/ڈEq~\/Ώ}hYgۀhr$J `#ىt4Txo'.lH#bDxNHi2E2-EW8)SV$F!l}5mv4ř GT`e!ވɅ&#+G%&iun+' \[ tꏣst;S <YW0LFN70^{;Ž\E}3 c鸼qzhp!9 ['x3 Z$o^!6VqܻciSC<dgIV)Y s4nJmSy$"ӭh+C \ (@
P (ڿ½;h߅Bi&A'dgˇDۖTy_IS R+gjKQR(
d>&GYzi;__Ļ_,5ͦn?Ԝ2<Ub|_V$ը-o,+T42
u9x?iWTo "Rw! ۳w4EwaZck L-KEte.M EGe|y
FKp#BPŵn5rpA`Rul9\lTj(2ϊJ3 v[vsCay$ošKS Q"9.7(q 9p@ҢK*|xJx+rf9W
Ĺ?K8+}sCFr 䖂lV-WɯX[.{vmUa|l0Yflُ /N:M I8?=Ͼ= `tSRYGvR=Q7a[shxvT%m%\}qڐ ؋ j$'Uo7n]ٻ|o_e'$ 4$&9IzHtrN{{= wݻκYSrt8(*2H Lg諾kW(
(vL*Hy >~4!1 *6 *Ue2ehKp_ğn?9mA*Sb `kF:QE,&&jn뷵{ (@
P (~Um~:`.jeٙklGZ+ [GIsR+ CouGe OҀas/a?t >|[?Hg)ƀe/WѪӭ` dlxIS)W dKkI) [G1o lTt]:A:Kux:6?xU I
rWvᵷڟ3
P`Z.BOAJuHaל,4{~r:k:A:kD{rg~؝T_?Hg 2tR\g}A3tvFcӾwgHۂ˳cR,Nx˾ co}]c=xnnN.*<M^4EK,ye/6K:j{]waX-:viȻA:K]-ލZ#Gs V {t##߯RyxoR9K+z (oFdv> 4JuU:) ScWZG
P (@
P
Z6\݈J/Eґtɲ} nSi RM b!bY[w-F qfW֬O
KA 'O_j ,ݼ[-@T`W= 4-jת) K7bok(ml~AΫ>( |:. Qr
;݊*]v
UWqH&ʶ`vUB 6ܴ
.߀J Vܷ3/Q&qq(*߄m;
{ ^H?)iKY͌JQwrZC
, m }5Zfq`An!'mh6mD<2#"T/1ru&nScb QR^QFؾ2M.ogWFfSLY\r,-Vr G4/9k \H.5fan(7ΈhyR*O^ժFd<e[h&|MΖsQ4YĴ{BLqQ˵[_UpGuUL n|8vw +7&:m!X('u\ Tl*1J8uK 4)((GwtZ=L jkpw9wi˖R[X5&I _T߉Z #;}~18rlp,ޛ%ZNY(OԜ>ԢxoE,jcVD9 xl.zV^ynCdMLŮ_i )@
P (@
P`qVN0Vydƹ-yuqg S~}\ &44ݤmH) L* 7}i8zg!hnzb@[߉@Y{5b)eNvn&po?{u}=)yo->A4(YO+tqEꤏbk۴5Ws?`Ped ֗^Ax OP퇹Zճ3w|~3}[T?coM
vX_hWVnA:q]փEhBIt0:i=%=u EYEWsSSM.R,` &T RHl ~[x-S_u]!:(ymnRCUgPp%@eAAuX_# 孯 _|t睍8}`u:u.u3 J& [_Od uAqr0N+5Yz?h$]#U:Λ?Tף fLe +MGU hH `o)5=I9س=z=> lٺ"U_Z5H5<\ֈ2Nmmg]hqHk ~~_uw9wٚ,yהk !fuN cȓ.4 ٙ"PWQΩ\:GuuANۇHc?soK0u /jJ*ԆYw3t88DZز-px(E[?+G
P (@
P k2w ^@X*$s[yJ"=PU{OfHGO VL(75e g P hZImġlKK߯E<㐙j&%b i\;Z?MHAi(8 )vHrV4#ՄҎ} Ԍ'mmMVY}s[ ^QqbyIQblc;4At6SҥaY(@~Vi\!w> TRiwk-u mi 5A:tg%0딌))bL FFTeySǪ'ur@/. [59 w>scSZ2P m._XJ ) zPz d, .SIcC$'_͝ c;e# nihGXWQ"FI+ii}sM'9g)W+ Jq4E9Mg_\7벮Jp@~v Nj`Mڏ?uǘ5"PwoȆQ}KXsr-a @ IDAT_įWcP
dDY@E 8 t8;4O)@
P (@
P`?_u.[~=4: Ԓ~I|_.*,51VnHTffZ{K]uN0pV'EbmFf͒µB}lƤu~ uS k"M 7^aT)sRzطퟚWKhnoߘR/hknGWw7Za3ُe#
M=}
P@fC wNoz ٖ9 z4l:""А (4A!XarƳ>1:lu [E.R ?#,Ldb$#j? ][m}ݽfZq2"`7uL$
] ^i;s gIuLLnQQm3AǭGs<(= u#`:gkCli\` j]DM)ZzϵGj_O: Rǹo {m=@%2?~'{Kg;Z[gNuuzf/{,m;VF%"6$`0 <sv:J Y,v-s
P (@
PX|hˣ/㻱՚: Q"H';=߭A}}刊 Xh%}*61N`ÍMb2['_- ~-
c
76Td`SGEӦ(S:
H_9vɏ,[LT<Iҹ eR\-&EMJԀ 2PՌq9uBf.hl11R˲
=WvQT
KslRgq8:?FG4QI}ѮQj />֬qqs&5ڔy٦ u3:>hN2 !1vg=ca:$ ܵǓp'OźsR 6;O1W/ ͯS )]=z?ܽg/u'q,a%+sF#)-S u nKAfWιآ \ \ly"/"6 EcKY)-n'Կ 1k]~XeFcOabׯT (@
P (@x,?~ӟ`u<Fuz%%wJ~\nC62t1YNQt3oסF;[ߖ[gM(SB@m&۴檼a%InDG͜&IRk>GbArR RbYHq*hǿ>fO+a>
P wSGv*1.<m )3 ց+m@ O&HqW[1u2~qs.t}2s}=,
#)fdlm tGάbAŪ lU1:źs1JN E(w7bFj i }/ N ϡ4'b$dR}Ј5[F>ݔ'3tr%8~V}2Ҥ`vb
2EրlkωrHNGP'c(@
P (@
P/>9b45j'QtsO˾ =Xi]jde%c*} øW#FqvEN@6g-"oB2BnUkDcҪ4!CC^!F Jo}CBB2"㢡75149Smcsyn'FP-2.]D˓&;볬WPh֬7 ]NfOlQ
ɝhӸʴ:j/ g79G
;kGH :3ʘUjީX?#'>O9r8Ěg~GBQ#u2i-JpAl:{~bfi\LDN^ϥ zYgzf [qf֠/ qc+W:G<G3 V 6wGVƤ"%)9(ȰƭCam謱h)~iI brYL7|f9[ ߶"F2(tMJ<-T4%bzy (@
P [ (.??XsQhAbv(
hؗP|R mPހ#;`) us,LJvu2EjM5[\"/C%&>Pq2`#*g
6jL)43kwZ[&=߶_Yic 8oqI-"&m w(@P^`N{ ץ`vڳ:1HĊufE:2+ E5#?'vB}lECHʲriݤ|A[mUmVD$ ijQ- X xjzq'ԠYwd9gK{}:I7SΡ ʈ֧s/*œU'zץ3ｅm]/~ A X1Up}m5⫃b
D7B
:]5SsU-[T1ۃ.eW<.vp (@
P K@ޖGĢ<O mY $>A1H_]k\~]ѳlDöBd\L=ݩn@EF<i =ޚM7hMM-n Q/ut!9 ,GIφ,kIOflxvךQ*6Xð}NSq4.VJu͚Y2X/_w w1gt]e/bK^Q}$.vIV`r
Ҡ[ʟǦ 1n7*Zu1n0*tvVL>Y#(߳ =M緺dJԜm(ϰ| t3;qQ[XbX˲
77H?(v|QߚbD6+gqU^1D͝S2pվҽ?zV bONXh~S3zq :K,6)s7^L8,eu?uAYקs'X oy
۲,ˤ2w5}:"¦bdHs-"/`z琈}o>r8yc_t{Yr_z,l{6!W20 MMHˑ.{0EgNy6߱j=ŮJ
P (@
PSebeUh2#{_[ܵttaHimQuS45u!:,݅[."8܍5(B2MﭮC:Wor) Uh F@pr6"Mw7>Dk!a,.n yjth =S+Ï7PӦuu+qz f11F5o K7QoD*d<ڇ٩XmK&#%`@N:'(@/SWlpƯFtk#>s
W!P|$ }{'B ]uŹjlҊ1Rc %yր75 YvTFuȗCw'8 #
~ =;7Ecb$ɍE7Mr+oGUpʵ:%b;qkՙMQp?Vðو
cxvR wb|hn:mڟ1[ws}:7i?U^Qҏzfc&'iꛊow7g#Kj;N
rқW!E:RxSSf/ =,DKUn
7P٪Nlln֣0gKb 5 "(Pwy~aܡ (@
P (@X j'Ӹ!b9ƕ+1x hUXl^7
[@ pބ
76,{Dz_-MSgB~Y5y4|q1ك -)ZV݈ƤcM7'!mq֟QX飑:DdIlݮU=9=ր[ ֗?3vU_4v!a3<\^ufV ͅl +'cd7jU7`:K&c
J*45'E9= * &@3:yC@' ;;&Gvfdۥ< N7k>9츷m]rl[R
v5{8r,"^نTɈ瑯Izȶ(pKwd !<!5q;`4t3=<KXtsO| Dko)km[֨Y\{яgǵ
w/.]FZk`>ďCiw51ɭ6KP
*?ط:ڈ\-Hmf(:q\.vM4|:=q[yjy\[g (@
P ("lzgj. _e+m3 ߖniuwѨ.c1ڻn圚& VsbVm1*MZF666Eڮ[TƁu!Ǯ[*M䙧sT<'Mucn Sj MI3-ۤBnFo-̙Z4K\mQh6k_ = ԉmϧF/(@ۅe}ͨ<-~ %EG1|vZ ߙŇoȟNԤ;gqmt,ݍo`Y./6w6qPeGv9;.z7ڦ Rtt;W*6*rZ? *apg}7_sL)4tjH!K._)kN ?ggIn:Kj,ӹKk3/.~_4I~: W*> 8|ܨoG|_ו-f/R)u?~-F"K_l#}z 1i̭ut<% iS?94(@
P (@
P`O=}WE"!L<v<gLF~j&" A+V`܃1-u^{k8` Hfe"T %1ӊ A<'~^=7!;q0&Bbܣ.)r354!,<lI]IRjV>
С\^QRxoetF_Y뤌t1`Xo;ZzG8HDNbZ7& ^-04'>O/F8XBB-eɿ F7Z*wl֢?w6:Ilcz`}u䣯킼u~/p7Z:]7GKD4Gx 䤿z Ĥ %QW4fH1#Henjs1*$QS JRw\#(@
P (@
-0:2
Rƕ+G~VrG~!?elp'47sJ=i;N8v@;jď[kcgEo5UV]DPSp ^Vksf sXuJuksޒNgΛ鍚і-oAݸ>=6ZN[m? _#f؇{C ~i`MqG'Y-~<P]5H.v_8sR (@
P Eyae (@
P+[wto!K (@
P (@
P (#KZ5^ۙW` yG(@
<g?IhHw-qi6 (@
P (@
,y[[քk&$ lXY(@hƍ;ǡ.n,[GY?߫:O xbGwr)<M
P (@
P |.)h -k(@
8tFB` XSp
$wӹQP (@
P (@
̣ uˢ)@
P (@
P (@
P G~A .C (@
P (@
P (@
PKS`2Kk (@
P (@
P (@
P&'ƄO-Yl-96S_:9(@
P (@
P (@
PSǏ15=@`tliڅ<!D0`rLLNb|g] (@
P (@
P (@
P,0-tX)낂Vss+^ Oԗ Q7{ E 7;sQe (@
P (@
P ? GwO/BCBdQMLLBtuMX)(@
P (@
P (@
PXȺѥ}zz
Paa>w(@
P (@
P (@
,q@|l
P>/D b(
P (@
P (@
P~ &P (@
P (@
P (@
P``
P (@
P (@
P (@` @
P (@
P (@
P ( 0Pr^0(@
P (@
P (@
P?0Pwm (@
P (@
P (@
Px{n9/ (@
P (@
P (@
P 6P (@
P (@
P (@
<s =sL
P (@
P (@
P ( ]`(@
P (@
P (@
P 9ꞹ[ (@
P (@
P (@
P@h@
Pٙ'x (@
P (@
P 54-pOu Qc^!(@
P (@
P (@
P
pD 6 ( (@
P (@
PB 8kٲe
BPP /_a Bx]u^
P # 0
P (@
P (@
PVёQ] [eDP`]_SSSmO:l (@
P (@
P (@
P4.:*FG f[M }=}ݤYgnV"& (@
P (@
P (@
PPBCB ɓ'ʩE zX9X'M`.~
P (@
P (@
P (@w5mtl̯tR}#:u1Pw (@
P (@
P (@
P~(O#<4T ] (@
P (@
P (@
P y, (@
P (@
P (@
PV:o (@
P (@
P (@
P XV #P (@
P (@
P (@
P@O`+/ _{]?ut7
P (@
P (@
P (@gF#ꞙ[ (@
P (@
P (@
P +kTOB8PB"H >j*/i@/Q (@
P (@
P (@
P` ,p.+#b d |vӔ<A
ݎ^XI\lwg)@
P (@
P (@
P G`i}:`J#$XL3aFd$@u[[* ğΛC|
)1TO4b(@
P (@
P (@
P":{o [=`ىL)Įw Y [iK
A`|jZM==;߬z; (@
P (@
P (@_ ܍3gW,ݴ 9~Wanۏ )VgA84O.HfD_k5Z(,](c+ J5"$ё"` ٝ%ؼ~
b b4zDs"S2:2L:&՚Ȕ\䯉`kz;rI-ն3u#56A\_oDj|¬e߫EUdm{goQjT_ :&4DwuCx!\"cI1ۉګm /cr '} n:y7D\K[*\WzѬsS
C胰{I%p (@
P (@
P (@
PW1Jqy2
acrZp%)Cv!@]|n^]4M%uŎrܽtNw]941UQ8s= {pZC Pj's`Ɯik/oEqZQz \JלBYf W(ƅCxO&mQTbrTÁC4Fuy^wy<wO=g:SJiޱloWWq%8wkEsր24ݛ2l-c_4ٵ{R}(مKNɧd+Fd}c(CGRlۃݡ3h" Q 3jN\Fy> (@
P (@
P (@gSѯֶvH?OT6#ΝuK-݇k )
X[iϙ o ,gٛ [}>iL
;bŎ!!|}zB[~~y6f?[ȓרiR
*>>U s}{goK# MCGM$O _v
ɨx0_Cle gux1t[ۨ)ap)O&~ΫXk| c`GJ
f4xض\{Ud[e\ (@
P (@
P (@
P.6Pg
upaܭLaTLg:w 'O_miI1dؚ,'ɩ{8pIۈ
m O_ąvċDP3Zvnp5ܪ/OY_Z-ϗ!EdhG.jԆ[p_qf?bKJeOno/:d
u
uk*u )5 U\ Cn管#DfL|HGU[P־kx "Dl/\mIPMo/S!bfQMk_n8_GD00Bv[lpZr5E困:4*9~MVSZTԝd=
P (@
P (@
PxVN/sȌsZ<: g\ FUd)zeA4 ՚w!M[Oy
: ?W6X qE CaQ.AnwD?Mc~gؙNy;1>H՞Q45WOc<:g*r]8Oi7͕'`2Hq(& :5^ǁb
ys(So]];|皽m 2*+ |3\GkC(!器9>-N6*5&L~c釡a=r OP2`b SVڂ
7Έ Ay(g,I"rcվn:+֗AWsR+(@
P (@
P (@
P@#0t
S.绎enta Y@*Du!5brr+[*ps#nԧN}nCffCu5Ȧf;V@^B
6)E2V[G)g7+/?w:zRVy;E}7O:7:lzڧﯯStsg ..+QkE9<ۣo}k\LWlm0ừPr|(.!^<oktjnUB8,i9ͦ i.PE#؎MAT);& 0aY=}
P (@
P (@
PKP.Sr{ʮxNMN-'3rfk'g 2M/)'pe>.t\Vv+Qqk̩*"-v 4gS̘D#4(A
]M2]m Z,؇zVs9;E:ǖ0lhzpnCᩩqvG wmKG*Żvtuw:kP.w*y
P (@
P (@
Px! yIn]|R .OצFzpWьq>:IeMM)% 1Q*viw8߃>HVFK:twz5( ^ͷjkg-J26-1 ZoNN[ M+o/#Xp6 =ϯR (@
P (@
P? <Vn ~w?O:5es[Z[㖥J&Wk)iqu]&〦ш[N#d{!ԭ`1+% T2ܽҕ {:yllJͽ D@$2 s/k</ޮvi#wS^`@&fMի}{(_81-E"{CGUML
P (@
P (@
P *>9bmimz4JN{i_@]o:nK!@UϡM# %6>[`8E|ȫV" :\ [<^8[3Dbxiu\s^_OOY"ׯ?c*_>Gr?}n}NDZsu|#~-2.]|! ks>:j4ť7|tJI| (@
P (@
P (@
J+Ĩ C~0%fc7<<*
4 (-Xn"H)&o`]h v}-ߵÄ^dJ6-%yJMLFpĺt]] n dl+@7U N|9$? yoo#buoOjc27'[|J2R|Ͱl&6hD|\ {LUy>-^1'b}P (@
P (@
P <3ⓃGre&&'џ4A:ÌGx!WϤ㕝enlH uy JLM:_*ږcMƔvlb\!vm)TR,[iۈ<;EĆt(ҭMMhk=3m>>}ye w b ?o~ ct+?f ɏtNlO(@
P (@
P (@
Pv˂̰
M|q[<yDTZ:D /RyS&|
T@K$`
ͽBΆRaܼVeuq1YDivfCC"P:kU=-b<PM X=$ܨC4¢SQiHo"=[z]ق旋!2?´KĖ2r }QZq?&W1YJE[>k#5 2x}c54ܧ#p&Mݘ]̵L:N[یضbvY%#%` M'mG
P (@
P (@
PE`yAqƕ+1x Dnϒ{^@f\6Kv 8r w C kuTg.v?#`kuRdRX(g
7c yfn~uTjlޡDfiwdEpy6يO~2T;Qu-%T1Ǯ& ;D irDP`iݿ͗. @s=v9q2
@S "Pg3yddblY^W% ӼVB`7fx8RE֙Yy (@
P (@
P (T`YXMOLUfYJ, ]4tb]wA _>fP75|o\mLmz 8pN{Xߎ
~{ w%֭jZ\8q B4m|%# .<7h:kԝM骩bBDՂ5][{]*ֱOw~b+zO_W6Ӷ.9.ڦV+㙿|OTgmH9>>^Ϙk <f\iGӝ Zͯĵ,m^.eaN|A n55 )| (@
P (@
P (@9 ,7D95R^eoUz{& 9c2S0V
mEt ' >ġ$N[ oΰ'+SFB)I𘚞1La]cMhuݼ9<?I竽sCvA u
S`Qq8 14C;^M|,5s`@_[*`LL)چGg}yL@nv aa l (@
P (@
P < sJ+G~VrG~!?elp'47sJ=i;N6 ڵFů߇_+$ﺅȌBeA:l!I4]c4#YMgt@ n (@
P (@
P (@
̿cwRI%&w#(αM%5lc L>S3Mx (@
P (@
P (4
(#k51Ps 'O yYCr ݭ {(@919(@
P (@
P (@
PKY:'wAvX:ff*snީSGHLB
P (@
P (@
PXʚrK>o6u.H[/3(L<z+G1-c.4t7y- (@
P (@
P (@
8`Ι渹 z6
P (@
P (@
P| <:*zI|I (@
P (@
P (@
PF`2KkQe? [E
P (@
P (@
P R`rrJnWXhߵoٲe kb| N}( (@
P (@
P (@
PN ?4 ѱ1i À119 ҟuQ (@
P (@
P (@
̳=7cUT
Z15έxi<YS_rD-SSXER (@
P (@
Pxx =
A``^E9611 iRI@ -J7a (@
P (@
P (@
P`i H#FFGE,r[)@
khROܡ (@
P (@
P (# ͧ3u˲)@
P}ɢ(@
P (@
P (@
r?h@
P (@
P (@
P (@gNg)@
P (@
P (@
P A: l(@
P (@
P (@
P3'@3wy (@
P (@
P (@
P @? (@
P (@
P (@
P``
P (@
P (@
P (@` @
P (@
P (@
P ( 0Pr^0(@
P (@
P (@
P?0Pwm (@
P (@
P (@
Px{n9/ (@
P (@
P (@
P l(@
fgQ
P (@
P (@
P` 54-kXll4'0>1d\[2
(@
P (@
P (@
P!$t
P7cjj?\\4(@
<K5}uS (@
P (@
P@OLZKeH`Jb 4m7iT_xX-vfYGC
P (@
P (@
PcёQݼKiZhH B^<yD#$:iZN% (@
P (@
P (@
X5iM:i &id(V` u
7
P (@
P (@
P (@]:B͟Fiai80} G
P (@
P (@
P X
#Ԥ˓~[N}[OF
P (@
P (@
P <xG}?bL?̖dI爺%qH
P (@
P (@
P (@Mz(@
P (@
P (@
P uK6 (@
P (@
P (@
P` t"5N (@
P (@
P (@
P)>Spֺ1>u>ĜSQ8H^Sqx @D4bc"Plv^r1;(@
P (@
PN Kaer wė*-dR "uo__s+RITc?6$0=5ofa;)@
<I;ƮپO%?k볛w#b;G/Yvvg
P (@
P (`X@ 3 F \|{"Zf2 B洺k[D!/qRNY5]YjZᡔ!&/Z>ከxeH*f J)n1l- Ą O=+UF \ǡ/,RE;/H9KSGW(_ngߡUgG%gsQt2zg i @ IDAT4<i}s<uV;8k+ HXhXWN
P (@
P (F0dAFd&i~,H98a@jZ&dH~&d6IՎңئ,nhdĖnx} ݓ'sKtorJQĤt=KrnVcvZN8RپD
TԹkIbbS.tbӔ01
8PY_"ޣF$k Oi玮.jlBƮJ{y9Q[!=Y[< !Shzޚ=< su){6 O4ic :f (@
P (@#lٲ%{{[A ԡmȖGaD">9 0f KIg" ćJʮ.4鎺Sx(>HuK#=wק`Bh 0hB4Bsݦ%UH{@D
')_lAgG]i3%̮9kjmO'Sxȕ˝Ҟsz&Ps0<@Xw6Z4V- g|ӓvh.n%|8x$f (@
P (@
̋7_wA"&a*L5z}B{*&Tu@\39 vǢ/ V'ƪGѭ>s X;.zGf- }>=5йKE =Dʅ-p;[ }}ݝspz]۹q[ (@
P (t H(95 H9mn
5uynQqqzZHJŏ:eRsNmiD\-Pjr1͈\$GG"X`>4W_I[_#
R&VmJ!> XF9ϮH˴IPO5L4q80jnEcz!mDjRDxӍش~
b bPrt
(7dbu\;Z%6cc:Kp:NcW!;m%_,6rn qhUiXEIAVUcSk C^j Z:c"Ws:ol< D$!^,hIHEx* ({M@Na.Rc" #Q_U~^&K3wa{ :"_81g [&u]21 k2$E1=V\kUۮN99HY162Wt¿ F1zMj=ZcrV(.HGt}6-ѰG͢ 5V&#* C[ jѢ] >71"md BWIŲV%aMhxs}[um왋$o-E[eO1O9v8z;3rG!Cgk$U@X8PWYڲ")n:̭ } g<yI=C
P (@
PpC
qK>mmm_BI02))"Pf>5- RN)?IH kͶHAj%gBk$qxywҤb { >?qȷ V$ o'F![Sp[M6F^;#u"xQe.m5g
,d:fak ϸ+w+ {pZC P6W=KIV>Z4mK4d2<7 oWu%8wk3uv ͽT.bGj,am^g0d2J,9z$I.?jvy,ٻR_{%}`R/Z|~RNcL/Di^"'̨9qyXV ᓧN 65 fi翉W)3kٲq ج2b<ǭO ǹ>Tlfs{827b&p-PE
1" {wo fƶ[66wQz\9o،pz]4`2]D[˒aH N 5"0ls3t^XwcQbܻ~
m!m6%(q
v{^7xp%vbws\iEď
EnfPԝv*۟G}r[* >mK;.J'm;svԜD|(Sm뱥keD<~yڟ ]b:
P (@
PKWE
q: ~vw(S> >%V$)dfFJܷ>KKNǗqv(QJ÷tb
X[{p\-8]x)]& tl|I J:iJ^q<ckQMQz Y2wJcގ^Κ({ kN:0)Ƹm& Y/nH/ԍ;djHF?ūmH)ً 4րM/g7ZNͱ wd}*^ʭEj.46Xt@.*`c.VãOv]%1_7_k J+5mƫ˔cRn~ (<[{ b gbZvu1^IRA74D~zfqKw' ;w6 ͉x}w(H<3|? YZS8>Vώ)]`u%|av&YGnnC;z\1k:A:I*6vF;=ui?i϶[oSR (@
P xz?^ɬ ,:Ѯ֖@%$oO/3cipn^Fp.II"4MRԙ1;:V+.1) 'O_jtflͳ!&KJ Q
nu4t`24 b
KW{DI'WwVZkx -^h-7DX#75#6\Qno=ubFBl*/CqYm[-$\/ J?/WEdss] /[?sb
[G ?<~Zr)_g }eT)DC A6[CBa97SqA\ֺmxjp0ӏ`mυo['ݿŶ&;Z4d[`PLY%@%;Jq> N]Wj hW( iR4
JKxGy%W0bedt ;p4#Sn,ۊ\ȭe\u7l
U7q !JR* Ǥ"[n;b
O1[TIg
˳PQNcN3q|^Z1%bq
c Fgm8R*+|Uuuzg=8s {(R(Q%Re[llj|'qʵŹ)v/NqmHY)Eb;A @ QvrΞC=+ wy y,uoL^sz~obv Ǽ־ ]s%X454tRֿ@paxu_rD=7q!VܲyNY3z6.WY<-͇፸um4Ѻო3XkoZ kRٸJ' "9
!8)-D~&?wL y w. u9rb:l.
L! FyN4-ԈeSjr
DzGwzXRṆ9#ױ`~)%uyuɲwXRΟP/\tc3kZ]ڧV? o??;㦙ؖ!m B6:>}ڶ x^^|7b0[}|s{?~OcQ̃:-76T=KӯAKx?/V/?GB˴=t$'0_u= B*W;maq^ש?[̆UWd= zܼSdfY0{ԯ oO|^SۚGƺ[ho>!$Bbv>
9enmq>X к,
Mؼ`B'+5\c@gt@Esݰ
MÆ DG'vm~U~7ShR?t6Yٓk=NމwcSbfj1wi-onE{ňp&
O"$㳧dw;x͵Ft|6SXTw<ӗףJ]?c~<Р=~^8ísf6ZM qat#u#F Ŋ:SDKϒo6 xΝWv{%W8ۛvCź{`.}t!U9oml8/wݷ"zgM{N(V1n\o8A qDwk ^,xr[}| zC+q1Of u݇ }=ϡ'?' EJK>QXt(TF?k =j2TE!S]nyz\rOc35ʧLJ8d_ص=GӅr/TUV^Zq/[ ]?0D MSؐahXxq|ly3t;|ֵ'<,&ԬSTbfMl#ܼ}̙s<rr2jkm[u>K{ )}E:ӧڍ ^$7E Lw~E:!6l܈rHFg.#frtLߵm/-/mǼ~ 5~ v\JОRm,1Sْ!ڈg|Gj"vgѸ=X .2 M[#&"(R"5%^.'ksN6tiC̽yQT:Y}aѩT]"2/.ز{=~&NVhM{S)3{7vauժpr%jOߊw;"v[T;5yV G:v绛vbUl0m <5lq}w̼yf2">bC wka}Kmod?;s&e#@ A8c;9ϞX|3ݟo,$ D8? u(>b{ԙBe"a{p ˔Pd JYFpJaqd%> <a%U컺JTZ:]iUiɶ ЊG,_VL w_cvِSf#.!rs*V|.'{YJ.Y_Cp| ٌ#%1ݞN UQn鮉NCf6iEKhkr%F7庮k!ƝsJ+! cgCm1L_%X>7vzրͱ܅{T~ K1B+F <teU1U`-Y^cOC(K}:b!PSVbN- &,,4?/l 96YG6^EVeTͻ i期]dgG cޏ.B9 *0W,dd!#5iiHȓłƓ,ñ`i/_jc/ipo_vS&4ϛ;O D Ίvs8G ,A"/DSfW7uPw(<cWK _bgw,?
\z ]_S $3Zڭ ]hØxli'Nݰclg5t)/W Ni&^ qX+Sa/啥^0Ǵq7fс&X{%32?d,Gy)ĝl]ڳ-:dy/! v&z+|XъE*uNRMo. %e2#3 E;uv\'~۱0NI/eکv팉@1ʵy͡t=JOq>w-^+ǭYQ9u2 zаc76ɵ"<[l0z`3*L1r{.qk|Lo[4 -o#tOX3=t<WpMd8[CىǨbrp )-p<8 ZŅ櫶֑9(xc I> ?QD4 <e#}o, Th<:3&'Er\Y͕n&Y92_J2u|uZZdVW* WaRg0pv(L}U9Xr 8Ccu}I\w Gm0 `Ԕ wuõk`ĕDt4C j^ѕ/]^v(Sta% JBy#? 0YTH}o= %!.cYhֱ<q a~SR1݃^i7M W ݆])-VBq3= g0Rn~]Q.ODc*y,/E[eavF` K%{1(f枓 ptb:S&~4$IHHHHHH
xnD-Ou{F^FF 0 5qM.*E%hQyChnƬR^9~qљ
nG8DRZIV4JpW,+@N+ܳ b |crx}e6Ja]ɢiArU!˄Y ]rEi ˘,\˒[lr+!}M12sdfH8BkB ? ˦uS!Yء 0
V_>KiKE bB&093wN }6奎jTSc4yXp. 5rp <yTvow.Vq$̞*t-fpD=qF4x r \P"6NC-+ғ3.vI]J_tEH)mߐ هS:f|Тf~$
9>V#=']o& < t~G`a|$LO `糰@
X1[̟3Ř%7ՂaI#h>zd<[бh';RQ5iJ> ~.N dc{qɫzl ok*U.w, 0ocӌ~Dz1{Vvzڊy˶0|U] W[]5
c 7١/C~]2Z^eFY3Nd&.KWZ<'ÏIJ߇pY!7W kϕ<Ǭ{j^f¡;\L^
{<c.+6s 5deW9Y Ɯ"<@:/2S5}%{fxaQ1k C)jMuwIʲRKG?qev,g;9<z2+0שd2Jlfp<P^|e^}%PJc!9f Wdy=k415w<՞mVYfe{Q:Rx)W|)afEg6Gm w Nj >v=xhpx] fL"糧z}eM s +!'3M$@$@$@$@$@$@yL7yB"T ׄtxu4 u>~H ڥ 1@=8M#AePQĴkŪف߸Ś|)ރ=θ/،[v:b {Ͻݶ˩]o!VIl{ )կħ\ , _Q gg=8xȹˮY\gᾕbg)`9\q
n}]z l)m 8 p%Y=+\3\LogdF]}Ug9Kpj L9H[v " 7B4c
Y\ [/8涅v3GgW9V'?OgҥI؍\Sv`5˰ʮK> >ЃxX^ mI <M.@aA6Őٵl% 8fJzPYI"J ܰdp OfO͒|F`UeU2j8؈-kl73O@puxwXVyM/lL֟kUQRGh]
EpӜ@yXyR)(r:*|
, ߊ3t}8y } 8y $< E\#SZ~MHQMXb\lDkJ\c?x ]0]3q,>\M? 1XBeXqϧPm;wAJ$̼b jd2E|cC)w۶g S
5 '<Ghu0g
\qv.ό %%)8M;٘i)
~
ɘhE:}x.bv h9bL9s,٫mmf\:;?H P7gjm6nv {]989ΣZRi+./f:Jv`XjzpipX
ƵD ,.YP 'O״evְ̬:<pm=HMEz,"+h}پ O"{n !pX
V7ey[ Y9*Ϡ]hh= 5KfN"s't1\ck;:z_#
Pc E9X:WDkq jUJC#݇)eUalL7eN,V}N dad R
PJTivy o.CbAՂ|,߳X|Q_>- c[p@Qپsv,k`mĤpi^? 5vrsxFG|C *J<h 6iĩ!ROtu ht5C +k|}?OtXB$@$@$@$@$@$@CVҘƔs@4jFsK3mAC[OH
"]IwFf^_Y|9ފZC8ˡv
<>|U~H>au oN;_{B:][4[>:$7o
ή}y<ΰ`cK9Ӹ ;Δy4D~z=x5яt$K i>_& 5B[|"oܴ-!
8^5
u{~b--q2 VkN&~ӑEP<G3h9# E;}˚V]bʡ'8F f'^}UdY"M|>X1jv5kSSm{ʿuVڷf'Bߜ+[6cT<ȸ$+:GΖ]ykvF^1 6Wщ;vcލs͂)X|}t6; /9 ]s6]: 7VIe]n<xM?
R>v Qi5Kg['#+ 5ʅ FܫP#[E3oT;o ﮛ1͊mܫ1ͺ w&8 ftq5^v}O#^^ _2G⿏]]9 [8dHHHHHH.)Z:']]r"u1+MGmM @/+,_ lic:?X | ?}AM* <eˆGF>*vu=U|\jFY`\V@g6xW>Y⬵U^ lxy_Ʃ /> _cQ/ t47O?=q֙ xmG ~aӞf~Sչy?~ Mĉw~g_ (v8k =KQ_|h3 <~N =[ K.^eE5?p^!v3?)}pֿC<!^~{xu)hu; x,LQl +&v6<zMQCxOgϞ9c;j&+Z;cނ o6_
Zekx
ig6mGv_#}a?<qǀ!mFr= Qsٳ&.zM8pD['h: /ߐgB=>s5 G 1ٱ O)y w Ϸ_~
Ͽ%r 61^s1}6^NY;ƶd ÀeN}<~+Tp< \> R=aUuvvʞ;+1|Y
#lcL,9U:Ӌ\ KϐU߅j ζ۷J|ʲ~}sES,8-CfGx:х3yzff8 |iW=hCngHN+nru8'ln:kY 6Ceqb ̪3g;lVa)~W^O8 >sԢ07 ɣ^$'ct -dQoq|nMEϐygpdh{wMq9K
0,Pnv
LG W< s1m x[YlkĞ㮨A 4GdG= Y58`X>F}|܅/g^q1x$Yݔcͣ`NʞL8ottISہ3mhw72nëfmO X d
S)T\f~}<|Y|" @_?ܟQ O>#8-Q:}X~^Ę+z; .<H~ߏloH(*:;:P>sBdQk"~\{X=#Kv|E0vG?xI ˮD:); lqH,*y vY~R^1 ݇;x @
+-}"] .2{2|q=FN9=;# KIayut2:'GqűȞq~X D; ?gy9 _ <K܄OZJ}7 z|Kq"a߀Id"'^~qK`xc> qr>vU|.{;/A/hN$@$@$@$@$@$@
>H: >G-9'8BvCj8.\bOe`ǁ#h9эb̜+gNc]nn\+od w~8<h.aMetm?a4ic l?ц6G
t.~ 5EQuvmo
]G"8p?M\oR0! _ HPܟU&Zτ.b.PddBvXn* Z5ۈ*gL\+/ߣy'^}*^! :GN^' iUxl^C HS}{g}5S1K{ ߍ[OaLqDIqpΔXc9&8e,% 7P.tBĩ
EBh-"| T:ĥ7҃z+afy'nŎ[' ٳ8#u!+k-
{hfxOn`h8ڃx. 1W.V
[^۱tlWz9ɗ6BzۆgW罪x#>=4/ИHHHHHH. 8&̴̳֙^|!W\,p{aܣ _yPw/أߠﻦ7)yNDE$ 7i %zH {uʲ'pb+~/{<JuxBp}]uثϖ}[QVRaBjNpų)]1gd .x 0ې M 1nG9$0牀!遟"薽ԋ \NuBx "N+QS{
YGOII΄qv8#9S`}WD{1nG $@$@$@$@$@$@$@$@$@$@$@痀$,嚟,3Tz FFG _Vj;% $'chxX^C
Y g˄{ C'v-قHHHHHHHHHHH=P3Ԣ8ӟ4N_2CM CgEcTD]ݘTX`uiit('z06 s:(:@Y8#N$@$@$@$@$@$@$@$@$@$@$@$' qҴ^ojgLN
sP<މ̌ &[#Wa t(E'LAΏ%HHHHHHHHHHH.Vj) Ej;}^SǢ =MD M癩Qӆ9&iV^HH#ת9c<#& ˘@wZCΘ&{ҍLgJGw$ 4)EfD ~,j8#O6sk?qKe.NHΑPDzysL$@ffei&HHHHHHHHH?xġ x")%&!y4"4ҙ2_Ut: O ˋyZђ DK^ ; g5 =@N#H9:.lza.@.Ï*:vlA$@$@$@$@$@$@$@$@$@$@$p$^ˉVK~J8&sD5q<u4X_&rFpm# 8WDGNK
C'6Fk\= PL"!i\)T'PѰHHHHHHHHHHHr!FY7
%U| c qbbRG5OQ ucPpݹ/EJ3$@$@$@$@$@$@$@$@$@$@$@$0~ᴎzrn2 k1X4yc= v=s
+/
;&&DD O"{/ @P\]K 3ӣb;u,T\=OQ !p=KI1@e Ss*/11' %U8&cߘ= Y$)y,Y`wV#ԅl-(1*n## ŘzIioM c&q<:ړ \h+%֛*fߒdyHZɪAkF;o;&K/ar u&
/0F1iR!.]+]YgaJe%0O$@$@$@$@$@$@$@$@$@$@$@$p GsK ݇͛)pf ZsSW 3|b=3?CN8؇\c(nddCXs;0<sFԩgφjr @JJ
ԠvT^};v/"^z a/i ʿZWm,fNu8\3S"]ff ~Sx䑇
n``[HHHHHHHHHHHHR%ٲysQ5e
) K_qiQ#{źH5rw^/w9<4$"݃xO`ppCWu<HHHHHHHHHHHH./J#RZҌv4$%-ԢяBKLJ{:wS\CEgԅ[}mxE
S \B-WrqQ/</ J;RRӱc!)-- ^5ѳB*X@C
NkTpDTXh5TQ $@$@$@$@$@$@$-
uђ \t ksN=c>6::gpVf],=.e6uK\Y3gF5U1zߴ$ $Rg Bˮ^w}HNڕ jՍwg֍sV]dΘrÒt -?XS4ځюHHHHH'G0 Q7 zlK$@$@$@$@X2#s(Hs{f]rR2wX" u!FF1}tΦsaHHHHHH :D+ TLSȔnI2n<[1w;{e%HOOC2j
DWPgΪS?d2# P`/1H$@$@$@$@$@ '4%-9◓ГL}[?rr
.^Nť<t.B
9̐N[1z0FmmkةSˤ|$#y\$/
Ӧڟ9s]]]8%q=<<lQ )I&ȉx;} On;ׂ eaZ+qeB\_ ۓ @XJS2e:1[31VT:3XR&'[ 3Oa2a:
ȧ3:ߤ =z#%Fۄ Bmq6#eH=H)qWXX{)zefSS1edg8&8ۀ } ovGLdZZܔbAoP>ه57\< FRd嗍HHHHHH`" tE좚6o"?(7B 蜺:'Z}u =*r2:FɜST2ґc @ IDAT%"^uI1}i?o,6 ;vf̘aov,13銊wwFUUR:"+ICicW{*uRRR% d(6l #HHHHH`[7Y -IHHHHH5&38Uִ8ҘA ,BVb ~LF~K< ,YRSa8mB%%ˬBTgR1I`J tjˊ
cO%iNS!vj:f)\ ?8~p)U"ChT% |7(gk 9' %D P^4#sIΈ<Ӈx
=StjW"
R|Kp댼Ⱦ Q{{?01ֿKU9pdt*?ǯ 5BK ֡ NB v1bB-ݹ:=xB[>E }
S+-sӹQ{vESmE-=nY&ntj˴4_NPi%ԩJ;qJKKvlˆHWXZ,] tt91
:oė"m&.K&IHHHH <I)i Zo!)
{f%?3O<O헥tqÌ! G>b3; ;ռP6Ũ,Kԓpj {GS :R|
K]gtϰIHHHH$JڔelXg~͢/ 2歱u0]l }Ge maw.}v#Ƶ z6OfuH6}ړȑ#>sZ¯Lիjv=iķ}yՅH)&>Ti0dVSZeŃHHHHͪƵ7Vb]G>p{4a;m+Ta
U |y-,yێ
0e:'Ji f3/q{t /G0PP],56řጺ1j 4"|>}cMPz
N d1Hă诞FWr: 9_@.!vrV% 3ЯUe---l85+NWY9T6vzfKã%r3 F݇q?u6MN-9Pf$@$@$@$@$@2f^ X 晭pSF{a]}F{ya\:{ l;a⻰e i}xJ83gjK 3%3XHHHHH jJPWRaE}'}%* <Ё+{T`5v6mBڌ{; ΝVkbTM7|~I5Su܇MՅӧ{˸XP|444̙3UwLlgAaaĥYi{T0n, xsT!L6dHHHHBHUss+1 wlEf_ ћ:rMTv&F8;b.Jd*C9y4Ȱ #8ӧZ<ӪK=u$C@[ kg[Ng}g?cC>JBfo٧,H)U,s* ŒxZt1bT#7 {Ⱦ-) WJz6K+QYk $@$@$@$@$@$&hնTk-E.Q~ y%!<Embk7
ۺ ,Ց0Ү|꺻*ŧ~{, \ErK-|gg?0aF:}]g#It6+C](J ħ*%2*ŗ|S , A@H*{bj x7fxLLfUKKlJ!UoKQ)/ql{{DՂ"]p j&F7{zR{-s<-WQW7?^12|^(rT WOxj}nQK [л_ -ՕKg \2p:M?!|_ s.*̿cշ .9߈?x,tkss KSh'Hv1a|&* ڞQ.8|l3ɩ5p
ݍ,yTε/#; Gkӆ$ӧ x`
MP?,CgVVo~Ndl_W3)#IF2.SD3Ua b K3` Pq?n_4lc?^"%R3ߴ#IYYdJ}a+n |ߙ -_;
AKI~Tց`| Xʷ|
C-3e=}<Ha|kX7`ͦ&[cHJ<SՇ-O~֝k4y?wz62ep'yfVOWW%e{uW5SǁvocFc HxŞ@ M6]Re; mf C{J nf
;~і8aMg7p
Օt=Z:ܕIK<=ĒǤI|W }ħ|n빹8R|. ݓ^,~ƍ:
{RR|7XC{ @rQ NMڲG[2vK낄<v^q2xvV֤ݸf%e
u x-կ ?rjԒw_<m*a;6 /%uD%!AF!G Ryg3|kȴ Ɋ5ܸ~GSKf_o?ۈo|:`gq
Pގxoa5'k?ĢW/t>y cϡl{ <f4܉{qK+b'
S$@$@$@$@$pyp;a@Gψre-/D>LXUh *P1 sYxJ[S 1", "pO{G)3>ץ
f̓HHHH ̽~xll?>8dub/vX16J
;k& ,\
}2CoJFZWqVW/
?o3xNʒ=e|̾AVڱ>v'}yo
\^$=+S,v T"7')Kۧ#== j=VIi}6˻酵=_{yTd:}??JGfνVeV s"LJI)KmO:Gѱߌgl죸ȒULYŸpX)%iv|z,woHHHHH2 `i:<W7mk}>S˥ܕnօ|0] F$@$@$@$@>* cuwc<g`nfuZ*L6 wJEjMVn-n癡{}<VȔ|V^.NLNC8;eQm31y*:Srb4O "Z-*)*[mo>sJذOY=Ѯb.x˦§qjV}n}oQb-WlqgM&*?rT/q~4`wոҵ0iR1n] g*9M?yaRm<K#^ 6<uc۬2 Z D ʧ tg%'R|.s؏^ +m|Aj>:,ytr]" dz(qmz4^9sl+j"{Tv YFb{ v`ƲJ] %+K.n#B.Qtjk jJC- 9 KYuTU`\3 =iQ2sa 33A?Cga-S rꯄDyӟ"o@wĈ,i i ذAv dܜYV"Yz3-ҒM ˌ@# xY
ֺ" z{TzT=z]J.-Nsn-d4#K2CCHߣ8LeffbH|eg pKTEmVYC-_ /WZ.lbxhOHHHHr"fY36mʀ6lyqn_f͝XoX5 ˀFT
K"{" {JVqu&Izc?a\ Uv|ϮJWݏ<3LLGcudYҌy3v*3Oqy/mU?iDZ8;Va" >T[e8&Z)v;HJA{w3Wgc2:>{mlN1`=wG5Xs*L
x& @I 9C?xmC ۗnwNjUG=hgtN.1 \|Ysg^ Mܝ]ʇ|*=rrrWX7Jx <6ʧ=3}p,>]u.[Ua2SA$@$@$@$@~83u dqlٸg~^{%KqCQEjoaۡ3Fmt ];Tv~BP J1f!vށv }93<Ϲ}3;q{h0+d<ˇS
I7/>zr-=ly ڟ&z`HHHHHr <AV W]ɸ+t8{ P ib\xMtwWA;pJǮ
U%ŢWQd
SI>֪L FU0:Ξ^[D}Γ3PTTdXZ .XkQuuup6є//X 6=Q/4+ɘYO3 ݘ7هK _4c
%H KVB/tH2|h%+3b8/7K7> VՖcٛm$,aszc9NE u1fmޣ7F{O@̬,33Na;7MKD_7ZdqY=/,|ʦ7^7y z{t o?8X ]]3*قHHHHH%t 8U9"KXuv4r_ms^/#tb&]#7'PU%K0piŅb"+@ϓ-HN2|oӗ_8u
*-ڱkN===D,}9=+cS.M2Ƶ <#V/\z wcfHHHH@"٨Zκum)7WbZ%U.a^TbCf=S`^WͱuTN[' gLD|'v6tfwx 6-q<(ی֕P ݶ8iaΌKmDqC"辱>BݘigovY% ^QY_vGJZ$$d
xd4uU|` N]`]S m^ z Q҅y6vFzVKc3v4r_ms,^qq"ѻ^YM]Gaz2,F|(_gɓ'7}QgR>/3Qǣb}BXXX'ltCR>y @(s䙸¬Klo^>!I>[vSɲ?uXp y}#Kl 8=b}DZjWqbe8
K0izn+{;~4uy#N}N5̷/a]/遖x:o6cSpec3_Ɨd>
1кce'Pw+IHHHH.DO^_|O?zr cF*uxCYES8٨>pW0:iٸJ= ϑWZ?%$,ꥻ',P nט zM ?322P)rHo !zY:CSCR>Xj3{5RJ_ £kvC//3Q$@$@$@$@<,X/?|T^E3|EV2 ~'I/Cp'| a\=-/~ oV3\h_y
db[X 3VLs_}WO̻0, SQ vE;nlշt>rrSFV=r+<qZ^~O#f8'O ˚@Y9w,? 9bN[ hi:gdUE
ܔ{(df}P }:qV^2ڿWfpKFV܀nW7I' @2`J#_tjAtvvK`e+ 0uZ LtJS{ M5ŷS>@x_K0rB=jNaV3Gr>+T$@$@$@$@Eb/Xr5-121;6oXPQJp536dVF}q-/߀Z]SIP;xv$0+Y
x\q]y u/̒K签_ƲwƩ]q_/ _˖ y Wݏϭqb-UL8MN o4,w,Kj7r%7tU1I$@$@$@$@$p>7iAaiC]z^Q??[J ?mv!)t?=^B\kdDh1z]Cӿ@enR eFT(OE6m >\ EEE>sF|>P7*=N<RcF^ubJ x ^O1X:<$B_<Sci)]%&z! D-
ܰ6x6EJud#EXU_nG$Yw#u=a,7;-B_ʣH/?:6o\f;qmף*bC5'ғaqw~w8Orp)^x/{nlQdg=l3/\4 ͮEмwUHLBa|`.q4k=ǫJ%!;BʧצҙXګ>}ʵjx<WV' E@=O?+x4/4e{1 I\" d+k4yr uqadd}x?K8!E 0mEi~.!M.)f_#e,#/0rǝRX u ,c9+O-sotHfM~iEYΖTgS
cC'qC5x>LϚ: TO 331*c$g"7 1 #
dP }ZnҢ\SL7$ތwŻ([LOo(6\yn2`/Ƕd3Ҹ H @>))D-,ggDwBBNiyF 91,UΎׯ 賡#gzxE:3g)CW.19%
wt(vlG2pA^ P:KEILQzQ[UUJJJ$ӆ`;%C b&[3fZjω;ٳ2(H͗=* w.u겧O\pHHHH EvI (pI+YCY:w:]3<Dh صZ~@̀ -HCb8Lajzܸ3@e \d)WZv2v"! 2fEh;Uע5mTË:gg9VԸNfs 69V]QyE<p(1.YrQaȚBY8+uÝ ~b- L!evS$@$@$@$@$@$@)Ih]Byfv.8gf7C'b
%5P{2˜b]m3A$@$@$@$@$pySG;62lup6 Ψ̈$@$@$@$@$pp2'jA(\x}UU`ɧuZ,szmg0A$@$@$@$@$@!9x m42$! @,-G3 قVp"XWm|MVhΨuu>;&f3 \> EX. EYEDD hM*ݜsp]BۨF β$! D2X *T; o7X1 'y eN@)L^.1عD9G 9R>9.Y)*,vۀ9 IԘ?';zil7 -WK958$5%~H$@$@$@$@$0^II-2؞HHHHHH `kKJ -dptp]ݡc|.ic7M{U9'**A?HHHHHHHHHHHH"֚LND na#>< M:2W`]BU=~uCleN> M! c$:cXDi( <d-ISz8:? XB*`4zHHHHHHHHHHHHH }.
N8:ȝ"\rRQ<
|mSeQ@D,P^A?}[6< @8MT6I̱3ꔡpRv s22 CuNBqleʜQb:S7omy& YYFJJ
ܻ^gg9 >Tefff"%9C8;Z8sd@o+{0~2U+o"y& dge!WTkW6i'L\nI,0'Ƞ9%NJb322,OIHHHHHHHHHHH."}}"%#EP3s:;Tڣe&YѲƬzJԲmU;K.n7<ߺM#[ږ
''+exs9$@$@$@$@$@$@$@$@$@$@$@$@$@_ DlKIN-G2RvN8Ŷ
ND4.Ч%{7+''wR atW3 D@4&Gf
HY;EN ND,y%63?Sk"sZWSi9rTSx# Jj.^y* ۆ;;3ޱ h}KFa:
S}o$ G:vNx]\Da/-NF`
;oNMIHHHHHHHHHHH.SRS6.Q-svp5zq\JX4~uNc'%gX $b]L$@$@$@$@$@$@$@$@$@$@$@$@LmI&L-IJPNIiPgHږ߇G&9Nvιӱ95 *PNH9YoSNh\^.W|- lYğץj?< @hd'L-zN1Rƌ:oslZ6`HHHHHHHHHHHH.8R@:eNJ
9)o=\]lXuvSD ϼ%{qrN#AeQuA# ɛurFBF§7/E+Z;ks:w#pu[HHHHHHHHHHHHH!јS:FkoЩ8B\#Adǟ(KvAc$@$@$@$@$@$@$@$@$@$@$@$@5@) 626MW|u0,@XCyNQw'nHHHHHHHHHHHH 켂viLcIojSFLr;P
ePn
HYvDQLr]b BjKFSt@ʱpR֛ ڰ e4)5x2N1wuуUPjtNe/ NuӘHSI9wUiN3R\3
Q %}%rM@3ӟq(XGpI$@$@$@$@$@$@$@$@$@$@$@$@$`Ԗ\S`2sR,9HB%p_L!Czf kN8BHH Pd_cpxיZvjwjT2ޚٌSL\'m,@!@K .tOo]Fݟ[r}E @ @ @%ġTʾ]W*+ `> ]_QTwR='ΝCo@ @ @ @ @ @ $7Iת:0:Ļ*(g7Hv˴.SծMy\@ @ @ @ @ @ $5ݠ<_]XJ{ydt]36fUd:H-r6Y7Yy|S:GJ<Q{:cg h8([
rEJN\nگ߈/ @ @ @ @ [zI5Qq5ڪ5ƾ+ϬbhG'=ĥv{kJ'qcuN6TZꗬR*j|AVܜwVӓ2{(vZz/ws~@]L*ץP|6udeuʱ~(_ɓ0sO~_ю?̩nU]45Jd ` it?LZ+^;"u5e;1&k7HzNƲ㧜 @ @ @ @ .*4 :5|!>Fڼ>++Wo_cul*S͝y-ɝp}I9n] ĵuĄ#p f@>ՙW&CߨVP]Sޜ^| 5=P7#4yk\tX??vUZ
j~ pkk/S&'~ 8)+Fi❀:*kK?2^TTʳSmeO0-@ @ @ @ (`ǘ\<R8WLjTɳSv"Qg)+$j)?nE6
;(kV%V0;;bFRVG] W<qFN?juM}W[Z)X.&}Q> N`%ɡfNauۯw s-s|Aay(;T"^~MF 8SS;-ONdhxXKJT|nZVdǏ H[r|Fzyή
U|7@iffk/zR0*/6.*p۾OK//}2luQQg4i!v ojEupkv%(3iگ~NȕdSؽrקZqKdzh {%HGI] UVʽC9^WUGŎ69?{|\H# hZX@
A> ~|M='59*xe|o+qfFJO~E&sEK~9|U.&bZY$bp'enR)Ey7#CqSw'~s[++OoֶQDrɎBɓq۟npeJ\NvNfK{ˤr:CI9(ןKTή=v' C~H j{{P\5]D3KZ O;wKN4=O
RdW + =xsк]7L^Q·ejdw{pS3HIKW )]{UC+4 ߚ *AAyvQgss `vʓwUj0veӖ*Ʋ=
=qX ꪭ~ܖQe\ [_˹G QK63H/%=rPTK5j|rAp5juɥG9 ?;ސ
?%RSn._+,G^j-qZF@啣~\Ym_nJ>߮[r|wLNiJS94F?kE~"aHA[IC]:~AN<Q?j{mM?cw NU
GW` lUgmio
è \wk] ?Ҡ!c=Ҹz b]~kiY9}|*կkrqԔYK0ޕ]vIu: @J_?-?-*kmxJ;] 4U ~pmj\3crі5c]ժjp}=gv +Ŵ8sakUcYT]=תucu.J?ᛄ3Ul$صiݮt sOZNH~w +P*76@[+Lo^۫29pGRRR y //SsZc _+͕qM d*T7_o nx)ǮITs/T/Oz6l2k;=.-&7PzV~Y;W9'{Q?j{-8yײ74* Z&4mv؏3&Oڹ0;R^-TARSN rUk9aD+oLJ7HUNޏ E~\oBj?ڵ-sދ78LNʄ'UK ֎H_Mv ߙ.)@ @ @ @ R~eFsRiO$ QM&l3x:PԦ~X9Vz<8Qo~ON9k ܻ- >ёa6*sc/ˉN ;^9Y0.7ۮʽ\<sqI͡ẂHբ+{
ܖΞ$juqP c\;[c\:y)brBsXv%RFYݴ菽A~i+Dw+*}Oy2(c#ݔ"ΫǾwS M:[aךPߖ;&E-,IoWxtSNL8q)Ԙ
]=^ 0! w|_λ箕:99l/*+ nnl\ 1ζ
%|{Z)
u[ͳ
oA9
ߖwZQVV
H~NNܑfqw꿖Rwԣ_2<V z>nlc@tuT<1
8ʣjeM]@ @ @ @` 1&㙊[9+W`NqAuͳ{ov%UĄ+PM*h&6ϧb~cñyKھ\::C %UjѺBsP*&!/?7cQzڛ<P/gUyfܐ JNntwUу%pIV%Ҽ-S\7VȋuFtҗ
~Լ}L_ᶹBX:y n}%>hq z^-<jl}IU4nkn( lS2p@:>=eǬ%/ƭK4?^s'?scVϝ떷miЏDk* gUi>&;f1Q,G8a}aÌ qU]S~W)9v*ma3~k8vfݏ7D|rT{ꑔ㒿?͠LHj~\+o.y_BŢ1;gqG\>sZ No -L+Wt4JfI Z+^R̄?lR^F[a[zVׅtF~r-@}XKvΨ_*:*˺-N[햽==/OV#hOZPSbcr_ ҩmbzH#CFzdRF\'QռWv[];HgVko@A&}Ӊ*\;+c2>'
˘<O9.A:#r"NevNwQ۫!?gl#`V&ܯkR0_ ө,Z/{h
Xnȸ Q~CEJΌk,=ᷡ9G*X .v_?ޯ>U5?4PX.{7tZNK% 9Y]{y|! +=hs # Y ( e /0iVz)o LtRm]uvIV'~qGǤ,wVo%;W} N>30Y22$#Z&W HӮZR$sbCT+^1I:Xn4>4'vƾV[SonFd "IDATlZLoilKeݹ+9x[̒2Ή;
f+j0d*C/d(锆禳ZΪ:2>'c69>>Otv^<^!@=B-NO+v]3
{f'XL ΕP,oNH60;G~/5/~oV ߚ!y4ȉժ]}s-UR~m\boL a2)ZK^Tl,6NaViC JoMRU]nW}Fm^]ҶR,VS^Qy~ 7*O xHF҂Fcfg#1] <| b"U0AMW/\".nqv8O;Y;tF '[+0ag.D?6gٯyA7+maZDm n4~IY;l3P O^Z tˁcڿWe(/ÏGrŸ2N"SVA:̪rEګ`IZ zD uߕ~4"8|M<͕?hZs7/|.m 1s] ` h5;+>aVzwz.E%, 20t-% ܩg[g Uz0X k0 {gʼn?dsL~oa_\g(Wheef/Y?eUjT .ׯs {&I;[R>&3SfәlJy8yN,_18zЭrkg_]+Z˦D
֯ $i>) ON;˦Ujc
OC=VY -yͧd״O\jPfr{Ikm*9*KQwp(*"jsNL@ @ @ @ SZ
)7x".i?.P7`p ?zԤ;Ɔ ]wYJcu/߾u~&p97*]:]݄ V~7#[w^ͮo`t OpZU/˯LG\ι Ӗfi"
rjk7^;ׯW)1L' \'~^J45-TjʭsIQ.Ͽ tF/6`ZJg ӼBt c~hۇ3TA
z|vh-wSۓ" `
d1䋽+qL q]S K}tv
;g$plOkK]˾+3WJ}gq1ȗ',}R6mt991T)vFO+S7ֽ ?R#rsd|2s]K[@]O}^sz璼N:$[Q[+kfFb*h?ԴW*̒o:'Z̨:_@y>|AAu:~_л}hE -;Ŧ&y.s^;R:uB8yQЮϜxGy,*G]kTqGyFb-kkzY&2!Z_[@ @ @ @-Ś-/ W%.;;շrj=B&xK^ݒ.l+uۻ"!Ǚ@Ji~we&KA݄nRδb rbRZ]U5Xj oTZ_hg8/ݼIn+&Hjv#}cX#t ?Q;ƛSSKSMtJV)s5}MOȣQ7#wF2RkE<Qgs NFDke { itb2v3.zj7ʾC ±j 3wuׯbaT5zCcv'C a&, 9w)/{gM7w! MdHظ=~uWw-)mV|+#zZ,LH! h1&̿+i ʳ&]SOyG}N;Kp1; ܟW_y%&Z-u#
}9^s WÛQs4irmG6+m$v_G9AWK-Y#GJJp]Jծ:w>Vҹv &LmǿANwzj8*ohN/5%SM2ݽW|7CN^A<=2Dmן -@}
B+oJk+`'y_:dȚ@IfkZs'ݵ]2Jf_UCphgˤеzm
_?aX~taƲi5 sd@\ T*|cTMŽ(}c8Yu~z=/ɰ r;Nz) ):{2 > [/0Lڷ^Sl헷s Rbuݭ_JoqYﷃ곲R ݑQ@r|_-gR||?hhR7>ou;!-WݨT3np4.?_W,nRkKdd\nܴJo `(K_Ϥ'&99;']r'q !Ty㚗|56u#X
U{u_;ڵ28˦J%-mËb?8,U'co˻ʽzV͙[פ߱? EmN ý:ilp~O_H}~mɫf@jK˷
tlwsj~ϨEu^{YT_"ݓo>JȤl&
JD[}3l\?St+1?R(?|G6n,7z̺Rٵ
ݻ+7\ T|0ac,ꝟX>t[&WHˮ VonO D@ @ @ @` hA5[ }0KK(Է/;F>R?#K7ٖ<Y%QV.{]A1gJe\vb ho**g~WXa G{9\:u^*
̪}T.~}>O:\9_ 1J@3n&
i0>D^6»%*o?l* 3ހzyQdkvS# tVZo>l6nCb: {A2o瞃,x>&mWҸF] FmH.Oސ窍Rм!grG7oi_jd<)mN?Vѝ"p 6i]9n,M?EmniV' gm&3]^/Ϫ ]֮[@ @ @ @Hc
f&
Y=qG S=7 Naʝ^Fen:cwG.tƸoO=wM~wS? <jݩ +]2 S_O>]Mg% _B1ipJ"Uܿ˿JzcZ ûMO7p3x\גm?9z(f\& R fl}Ƥ_ɿ\>R x
(/GQ~,{p|g:LLɴZ9hlS2pN936>xSH{ q/;sw^( }qM=`86/㮟9?l~Ip4]X~q[:VI/V_P飳ҝz.or)3}%cq_g'OJ˭(b*i@ @ @ @`u cKڪ,mzGFofc+5G3I̹/ohhHh'jڟUAqVY%nGeۂ+,R֚:)/mU씌7mgs_Bۍ\JiU!sU_dW:RctrڪG=3N=.qjrDztwŗ>bG]Tl 27S# O5ο
L;GsY}t$jCU5;on)ekh4P.M1gH~ŕbl,Z+_!V ҸeL$p1+iv7T-`ַ1y)w}L8-;HVYk|,7܊[bh^# ){p_ x|~__(ڽ5(k#o{zEk?\.- kFb1;!ӏ;"1ʬ]c\kN=IF`4 WJf@㕓5{K#-R q%MDjOH\>7OS[6F h45A:ktڇm:sHwՐ~F1gH~#ҭ--{\R2{LM;@ @ @ @`e X3J WHU"l?ZM[q
I7'WryOS @ 8Qs kˇ3O; E`M iq
} @ tzrDm n4j# %T%//OF3_<}OQ]wV}̌<YY\+|z kxgo/?n픝p r
I%[oog /7ƌ $X6_
օ%iX=wDFGaI6e!sV%M +_:&up Eo ' ,]155ӦYVUmV.>+uJQQ>2}ܼoC]vIuA~@וM, 3 D`t|\fT*W߲vZc[f`]l+"
dc< ~/*X㞝 R$]@ @ @ @ @ @ )`ŖX(DAO''ChD܂YӍ+03R'jW:uȞ'wU! @RD1'Wt'OU`^{z g .(h~w<+垤; 21y*XmwY g_:5ť0˅` @ @ @ @ @ @ cPisssR(b0PrwکA
@ @ @ @ @ @ xwlɝjڏ-Q`0Yiy ѫI,<2?Z" ,=F
Tzp 5NA+gDl Q1:ԟ=Ŵ+ƍ<Pyq G e,*~9Y&^@qw}y =[C @ @ @ @ @ X*n `XU\Z 2Yf5ujRi+JaE @ @ @ @ @ XiĘ*i ԵڪWmp\Eo xUA52;Msk5zu ?lO? +M M+Sw9 B @ @ @ @ @ XXwo1~!fԴbf!Θ KG@I%L%+[#H0 P@ @ @ @ @ @ , d#tf ɖe@]$-4@ @ @ @ @ @`$ =eZ @9dn <GqH ,4bKbTʖ>0W
Wr B?j)(( Yf>kv#^2
<Ղ+҉Sg@ PY&&&칄GN*: *ۭ"' }G:@ @ @ @ @ @ @ g-dzH#8;1z %+䱹4 *D+#/V[Ib\;\:g @ @ @ @ @ @`\mY{UTk9{SE]^@ @ @ @ @ @ cccvjV{:#/S.VyuF@2uX2u4$ *ҍ7d`p0vk칓|%xu$ a @ @ @ @ @ @ gҢV=SuQ +F'B@ @ @ @ @ @ xkOrh3㱕+$.J.+1@ 7 2@ @ @ @ @ @ VG`jsg qCS:#
X@ @ @ @ @ @ =ZG`NNNʹcW+? 0K2::A I$PK]`" *~MA6;4g'RN(#dґ
i D>Em 0y2`OVZ:O v@ @ @ @ @ @ @ Ȅt 0 m~{Oǃ@]:JA @ @ @ @ @ X9 -@1 3Ē7#A @ @ @ @ @ $&YP<h1uHbXL@ @ @ @ @ @ X屨:7*rSF @ @ @ @ @ P`cN 8TF2F ,{l uf$@ @ @ @ @ @ cR etO]@ @ @ @ @ @ PB Y>3ey*0i@ @ @ @ @ @ 3-I:,XN nvn.@ @ @ @ @ @ X'֭ X1 V1E @ @ @ @ @ @ @:\}J-fxTgf\K3<%@ @ @ @ @ @ G`CaI
уiZFZQZ^<G\kpzѾnN=r0X:C,G @ @ @ @ @ XE
ecq绂l`K!j^`PfgtF fnΞi! ,y)R9=fٴuԃnzI\@Ψo7x:!<-" ZyVԢi*Lg ֒V.QYQGoe_̦VO].[r(D @ @ @ @ @ @`% [I&ǂ l-" $u+X@ @ @ @ @ @ eV1Q@ @ @ @ @ @ $@n% Pl*& ?TdT} IENDB` | -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-buildtools/.gitignore | /target/
| /target/
| -1 |
apolloconfig/apollo | 3,870 | fix apollo config data loader with profiles | ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| vdiskg | 2021-08-04T14:42:01Z | 2021-08-10T01:11:02Z | 8c0241cbb2041eb3e34cb8c12a7dc1f1e46417ed | 2c9b4dccbcf31012913b270cc356a30ab0cab89f | fix apollo config data loader with profiles. ## What's the purpose of this PR
fix apollo config data loader with profiles
## Which issue(s) this PR fixes:
Fixes #3867
## Brief changelog
add a field `m_pureApolloConfig` for `DefaultConfig` to prevent the `DefaultConfig` return the properties from the `system property` or `environment variables` when work with config data loader.
Follow this checklist to help us incorporate your contribution quickly and easily:
- [x] Read the [Contributing Guide](https://github.com/ctripcorp/apollo/blob/master/CONTRIBUTING.md) before making this pull request.
- [x] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
- [x] Write necessary unit tests to verify the code.
- [x] Run `mvn clean test` to make sure this pull request doesn't break anything.
- [x] Update the [`CHANGES` log](https://github.com/ctripcorp/apollo/blob/master/CHANGES.md).
| ./apollo-configservice/src/test/java/com/ctrip/framework/apollo/configservice/integration/ConfigFileControllerIntegrationTest.java | /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.integration;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.netflix.servo.util.Strings;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigFileControllerIntegrationTest extends AbstractBaseIntegrationTest {
private String someAppId;
private String somePublicAppId;
private String someCluster;
private String someNamespace;
private String somePublicNamespace;
private String someDC;
private String someDefaultCluster;
private String grayClientIp;
private String nonGrayClientIp;
private static final Gson GSON = new Gson();
private ExecutorService executorService;
private Type mapResponseType = new TypeToken<Map<String, String>>(){}.getType();
@Autowired
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Before
public void setUp() throws Exception {
ReflectionTestUtils.invokeMethod(appNamespaceServiceWithCache, "reset");
someDefaultCluster = ConfigConsts.CLUSTER_NAME_DEFAULT;
someAppId = "someAppId";
somePublicAppId = "somePublicAppId";
someCluster = "someCluster";
someNamespace = "someNamespace";
somePublicNamespace = "somePublicNamespace";
someDC = "someDC";
grayClientIp = "1.1.1.1";
nonGrayClientIp = "2.2.2.2";
executorService = Executors.newFixedThreadPool(1);
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsPropertiesWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, nonGrayClientIp);
String result = response.getBody();
String anotherResult = anotherResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-gray"));
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertFalse(anotherResult.contains("k1=v1-gray"));
assertTrue(anotherResult.contains("k1=v1"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=override-someDC-v1"));
assertTrue(result.contains("k2=someDC-v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace.toUpperCase());
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayReleaseAndIncorrectCase() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConfigChanged() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
String someReleaseName = "someReleaseName";
String someReleaseComment = "someReleaseComment";
Namespace namespace = new Namespace();
namespace.setAppId(someAppId);
namespace.setClusterName(someCluster);
namespace.setNamespaceName(someNamespace);
String someOwner = "someOwner";
Map<String, String> newConfigurations = ImmutableMap.of("k1", "v1-changed", "k2", "v2-changed");
buildRelease(someReleaseName, someReleaseComment, namespace, newConfigurations, someOwner);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
assertEquals(response.getBody(), anotherResponse.getBody());
List<String> keys = Lists.newArrayList(someAppId, someCluster, someNamespace);
String message = Strings.join(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR, keys.iterator());
sendReleaseMessage(message);
TimeUnit.MILLISECONDS.sleep(500);
ResponseEntity<String> newResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
result = newResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-changed"));
assertTrue(result.contains("k2=v2-changed"));
}
private String assembleKey(String appId, String cluster, String namespace) {
return Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(appId, cluster, namespace);
}
}
| /*
* Copyright 2021 Apollo Authors
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.ctrip.framework.apollo.configservice.integration;
import com.ctrip.framework.apollo.configservice.service.AppNamespaceServiceWithCache;
import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.ctrip.framework.apollo.biz.entity.Namespace;
import com.ctrip.framework.apollo.core.ConfigConsts;
import com.netflix.servo.util.Strings;
import org.junit.Before;
import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.test.context.jdbc.Sql;
import java.lang.reflect.Type;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.springframework.test.util.ReflectionTestUtils;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
/**
* @author Jason Song(song_s@ctrip.com)
*/
public class ConfigFileControllerIntegrationTest extends AbstractBaseIntegrationTest {
private String someAppId;
private String somePublicAppId;
private String someCluster;
private String someNamespace;
private String somePublicNamespace;
private String someDC;
private String someDefaultCluster;
private String grayClientIp;
private String nonGrayClientIp;
private static final Gson GSON = new Gson();
private ExecutorService executorService;
private Type mapResponseType = new TypeToken<Map<String, String>>(){}.getType();
@Autowired
private AppNamespaceServiceWithCache appNamespaceServiceWithCache;
@Before
public void setUp() throws Exception {
ReflectionTestUtils.invokeMethod(appNamespaceServiceWithCache, "reset");
someDefaultCluster = ConfigConsts.CLUSTER_NAME_DEFAULT;
someAppId = "someAppId";
somePublicAppId = "somePublicAppId";
someCluster = "someCluster";
someNamespace = "someNamespace";
somePublicNamespace = "somePublicNamespace";
someDC = "someDC";
grayClientIp = "1.1.1.1";
nonGrayClientIp = "2.2.2.2";
executorService = Executors.newFixedThreadPool(1);
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsPropertiesWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(someAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, ConfigConsts.NAMESPACE_APPLICATION),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?ip={clientIp}", String.class,
getHostUrl(), someAppId, someDefaultCluster, ConfigConsts.NAMESPACE_APPLICATION, nonGrayClientIp);
String result = response.getBody();
String anotherResult = anotherResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-gray"));
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertFalse(anotherResult.contains("k1=v1-gray"));
assertTrue(anotherResult.contains("k1=v1"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsProperties() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=override-someDC-v1"));
assertTrue(result.contains("k2=someDC-v2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace.toUpperCase());
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJson() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-dc-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithIncorrectCase() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?dataCenter={dateCenter}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), someDC);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals("override-someDC-v1", configs.get("k1"));
assertEquals("someDC-v2", configs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayRelease() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace, nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-release-public-default-override.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/test-gray-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testQueryPublicConfigAsJsonWithGrayReleaseAndIncorrectCase() throws Exception {
AtomicBoolean stop = new AtomicBoolean();
periodicSendMessage(executorService, assembleKey(somePublicAppId, ConfigConsts.CLUSTER_NAME_DEFAULT, somePublicNamespace),
stop);
TimeUnit.MILLISECONDS.sleep(500);
stop.set(true);
ResponseEntity<String> response =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), grayClientIp);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity(
"http://{baseurl}/configfiles/json/{appId}/{clusterName}/{namespace}?ip={clientIp}",
String.class,
getHostUrl(), someAppId, someDefaultCluster, somePublicNamespace.toUpperCase(), nonGrayClientIp);
Map<String, String> configs = GSON.fromJson(response.getBody(), mapResponseType);
Map<String, String> anotherConfigs = GSON.fromJson(anotherResponse.getBody(), mapResponseType);
assertEquals(HttpStatus.OK, response.getStatusCode());
assertEquals(HttpStatus.OK, anotherResponse.getStatusCode());
assertEquals("override-v1", configs.get("k1"));
assertEquals("gray-v2", configs.get("k2"));
assertEquals("override-v1", anotherConfigs.get("k1"));
assertEquals("default-v2", anotherConfigs.get("k2"));
}
@Test
@Sql(scripts = "/integration-test/test-release.sql", executionPhase = Sql.ExecutionPhase.BEFORE_TEST_METHOD)
@Sql(scripts = "/integration-test/cleanup.sql", executionPhase = Sql.ExecutionPhase.AFTER_TEST_METHOD)
public void testConfigChanged() throws Exception {
ResponseEntity<String> response =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
String result = response.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k2=v2"));
String someReleaseName = "someReleaseName";
String someReleaseComment = "someReleaseComment";
Namespace namespace = new Namespace();
namespace.setAppId(someAppId);
namespace.setClusterName(someCluster);
namespace.setNamespaceName(someNamespace);
String someOwner = "someOwner";
Map<String, String> newConfigurations = ImmutableMap.of("k1", "v1-changed", "k2", "v2-changed");
buildRelease(someReleaseName, someReleaseComment, namespace, newConfigurations, someOwner);
ResponseEntity<String> anotherResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
assertEquals(response.getBody(), anotherResponse.getBody());
List<String> keys = Lists.newArrayList(someAppId, someCluster, someNamespace);
String message = Strings.join(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR, keys.iterator());
sendReleaseMessage(message);
TimeUnit.MILLISECONDS.sleep(500);
ResponseEntity<String> newResponse =
restTemplate
.getForEntity("http://{baseurl}/configfiles/{appId}/{clusterName}/{namespace}", String.class,
getHostUrl(), someAppId, someCluster, someNamespace);
result = newResponse.getBody();
assertEquals(HttpStatus.OK, response.getStatusCode());
assertTrue(result.contains("k1=v1-changed"));
assertTrue(result.contains("k2=v2-changed"));
}
private String assembleKey(String appId, String cluster, String namespace) {
return Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(appId, cluster, namespace);
}
}
| -1 |