Skip to content

Commit ffc2eff

Browse files
authored
Merge pull request #795 from topcoder-platform/develop
[PROD RELEASE] - WorkManager Changes - Connect Decommission
2 parents 26c2207 + 6078188 commit ffc2eff

32 files changed

+1863
-152
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: 2.1
22
python_env: &python_env
33
docker:
4-
- image: cimg/python:3.11.7-browsers
4+
- image: cimg/python:3.11.11-browsers
55
install_awscli: &install_awscli
66
name: "Install awscli"
77
command: |
@@ -149,7 +149,7 @@ workflows:
149149
context : org-global
150150
filters:
151151
branches:
152-
only: ['develop', 'connect-performance-testing', 'feature/new-milestone-concept', 'permission_fixes']
152+
only: ['develop', 'migration-setup']
153153
- deployProd:
154154
context : org-global
155155
filters:

config/custom-environment-variables.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"whitelistedOriginsForUserIdAuth": "WHITELISTED_ORIGINS_FOR_USERID_AUTH",
5252
"AUTH0_PROXY_SERVER_URL" : "AUTH0_PROXY_SERVER_URL",
5353
"connectUrl": "CONNECT_URL",
54+
"workManagerUrl": "WORK_MANAGER_URL",
5455
"accountsAppUrl": "ACCOUNTS_APP_URL",
5556
"inviteEmailSubject": "INVITE_EMAIL_SUBJECT",
5657
"inviteEmailSectionTitle": "INVITE_EMAIL_SECTION_TITLE",

config/default.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
"customerPaymentIndexName": "customer_payments",
3030
"customerPaymentDocType": "doc"
3131
},
32-
"connectProjectUrl": "",
3332
"dbConfig": {
3433
"masterUrl": "postgres://coder:mysecretpassword@localhost:5432/projectsdb",
3534
"maxPoolSize": 50,
@@ -40,8 +39,8 @@
4039
"url": "localhost:9092"
4140
},
4241
"analyticsKey": "",
43-
"VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]",
44-
"validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\"]",
42+
"VALID_ISSUERS": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\", \"https:\/\/auth.topcoder-dev.com\/\"]",
43+
"validIssuers": "[\"https:\/\/topcoder-newauth.auth0.com\/\",\"https:\/\/api.topcoder-dev.com\",\"https:\/\/topcoder-dev.auth0.com\/\", \"https:\/\/auth.topcoder-dev.com\/\"]",
4544
"jwksUri": "",
4645
"busApiUrl": "http://api.topcoder-dev.com/v5",
4746
"messageApiUrl": "http://api.topcoder-dev.com/v5",
@@ -54,7 +53,7 @@
5453
"EMAIL_INVITE_FROM_EMAIL": "noreply@connect.topcoder.com",
5554
"inviteEmailSubject": "You are invited to Topcoder",
5655
"inviteEmailSectionTitle": "Project Invitation",
57-
"connectUrl": "https://connect.topcoder-dev.com",
56+
"workManagerUrl": "https://challenges.topcoder-dev.com",
5857
"accountsAppUrl": "https://accounts.topcoder-dev.com",
5958
"MAX_REVISION_NUMBER": 100,
6059
"UNIQUE_GMAIL_VALIDATION": false,
@@ -86,5 +85,5 @@
8685
"CLIENT_ID": ""
8786
},
8887
"STRIPE_SECRET_KEY": "",
89-
"sfdcBillingAccountNameField": "Billing_Account_Name__c"
90-
}
88+
"sfdcBillingAccountNameField": "Billing_Account_name__c"
89+
}

config/development.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"pubsubQueueName": "dev.project.service",
33
"pubsubExchangeName": "dev.projects",
44
"attachmentsS3Bucket": "topcoder-dev-media",
5-
"connectProjectsUrl": "https://connect.topcoder-dev.com/projects/",
5+
"workManagerUrl": "https://challenges.topcoder-dev.com",
66
"fileServiceEndpoint": "https://api.topcoder-dev.com/v5/files",
77
"memberServiceEndpoint": "https://api.topcoder-dev.com/v5/members",
8-
"identityServiceEndpoint": "https://api.topcoder-dev.com/v5/",
8+
"identityServiceEndpoint": "https://api.topcoder-dev.com/v3/",
99
"taasJobApiUrl": "https://api.topcoder-dev.com/v5/jobs",
10-
"sfdcBillingAccountNameField": "Billing_Account_Name__c",
10+
"sfdcBillingAccountNameField": "Billing_Account_name__c",
1111
"sfdcBillingAccountMarkupField": "Mark_Up__c",
1212
"sfdcBillingAccountActiveField": "Active__c"
1313
}

config/production.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"authDomain": "topcoder.com",
3-
"connectProjectsUrl": "https://connect.topcoder.com/projects/",
3+
"workManagerUrl": "https://challenges.topcoder.com",
44
"sfdcBillingAccountNameField": "Billing_Account_name__c",
55
"sfdcBillingAccountMarkupField": "Mark_up__c",
66
"sfdcBillingAccountActiveField": "Active__c"

0 commit comments

Comments
 (0)