Skip to content
This repository has been archived by the owner on Aug 29, 2024. It is now read-only.

Feature/UNR-2132 additional endpoint support patch 4.20 #1531

Merged
merged 29 commits into from
Dec 3, 2019

Conversation

improbable-danny
Copy link
Contributor

Contributions: We are not currently taking public contributions - see our contributions policy. However, we are accepting issues and we do want your feedback.


Description

Adding support for CN endpoint

Release note

  • Adding CN endpoints to DeploymentLauncher

Tests

N/A

STRONGLY SUGGESTED: How can this be verified by QA?
Launch a deployment in CN region

Documentation

Not needed

Primary reviewers

@joshuahuburn

.NET upgraded to 4.6.1 to link to new Platform SDK
.NET upgraded to 4.6.1 to link to new Platform SDK
…m:spatialos/UnrealGDK into feature/UNR-2132-china-support-patch-4-20
@improbable-prow-robot
Copy link

Corresponding JIRA ticket: https://improbableio.atlassian.net/browse/UNR-2132

@improbable-prow-robot improbable-prow-robot added jira/UNR size/S Denotes a PR that changes 15-39 lines, ignoring generated files. labels Nov 27, 2019
@oblm
Copy link
Contributor

oblm commented Nov 27, 2019

There exist instances in our code base and documentation where the assumed regions are EN, US, AP (omitting CN).

I advise an audit (crtl - f) of these.

CHANGELOG.md Outdated Show resolved Hide resolved
improbable-danny and others added 5 commits November 27, 2019 12:07
Co-Authored-By: Oliver Balaam <oliverbalaam@improbable.io>
…m:spatialos/UnrealGDK into feature/UNR-2132-china-support-patch-4-20
…Launcher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>
…Launcher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>
@improbable-prow-robot improbable-prow-robot added size/M Denotes a PR that changes 40-149 lines, ignoring generated files. and removed size/S Denotes a PR that changes 15-39 lines, ignoring generated files. labels Nov 27, 2019
improbable-danny and others added 2 commits November 27, 2019 14:23
…Launcher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>
…m:spatialos/UnrealGDK into feature/UNR-2132-china-support-patch-4-20
Copy link
Contributor

@oblm oblm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the audit and the CHANGELOG update, this now lgtm

Setup.bat Outdated Show resolved Hide resolved
Setup.bat Outdated Show resolved Hide resolved
Setup.sh Outdated Show resolved Hide resolved
Setup.sh Outdated Show resolved Hide resolved
Tabs->spaces

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>
+ Changed tabs->spaces
+ Sorted DeploymentManager includes
@improbable-prow-robot improbable-prow-robot added size/L Denotes a PR that changes 150-299 lines, ignoring generated files. and removed size/M Denotes a PR that changes 40-149 lines, ignoring generated files. labels Dec 3, 2019
Setup.sh Outdated Show resolved Hide resolved
@improbable-danny improbable-danny merged commit 5f2743a into 0.6.3-rc Dec 3, 2019
improbable-danny added a commit that referenced this pull request Dec 3, 2019
* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Added release note

* Update CHANGELOG.md

Co-Authored-By: Oliver Balaam <oliverbalaam@improbable.io>

* FIxes from review

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Updating spatial version

* Modifying Setup.bat to respect china endpoints

Adding endpoint settings to LocalDeploymentManager

* Changing china flag to capital

* Fixed URL based on the console

* Update Setup.bat

Fixing whitespace

* Apply suggestions from code review

+ Formatting suggestions

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>
Co-Authored-By: Joshua Huburn <31517089+joshuahuburn@users.noreply.github.com>

* Update DeploymentLauncher.cs

Whitespace fix

* Some items from the review

* Changed comparison to case-insensitive and using --china to supply argument instead

* Adding --China to shell script also

* Update CHANGELOG.md

Added some more info China flags

* Apply suggestions from code review

Tabs->spaces

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>

* + Command-line args changed to lowercase
+ Changed tabs->spaces
+ Sorted DeploymentManager includes

* + Command-line args changed to lowercase + Changed tabs->spaces + Sorted DeploymentManager includes

* Fix spaces

* Fixed formatting

* Updated spot version
Copy link

@StefaniaChierici StefaniaChierici left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@@ -22,6 +23,9 @@ internal class DeploymentLauncher

private const string CoordinatorWorkerName = "SimulatedPlayerCoordinator";

private const string CHINA_ENDPOINT_URL = "platform-cn-production.api.spatialoschina.com";

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not 100% sure this is the right endpoint, didi @Helcaraxan confirm this was the one?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have been platform.api.spatialoschina.com. The production environment does not appears in the URL.

oblm added a commit that referenced this pull request Dec 5, 2019
* Feature/UNR-2132 additional endpoint support patch 4.20 (#1531)

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Added release note

* Update CHANGELOG.md

Co-Authored-By: Oliver Balaam <oliverbalaam@improbable.io>

* FIxes from review

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Updating spatial version

* Modifying Setup.bat to respect china endpoints

Adding endpoint settings to LocalDeploymentManager

* Changing china flag to capital

* Fixed URL based on the console

* Update Setup.bat

Fixing whitespace

* Apply suggestions from code review

+ Formatting suggestions

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>
Co-Authored-By: Joshua Huburn <31517089+joshuahuburn@users.noreply.github.com>

* Update DeploymentLauncher.cs

Whitespace fix

* Some items from the review

* Changed comparison to case-insensitive and using --china to supply argument instead

* Adding --China to shell script also

* Update CHANGELOG.md

Added some more info China flags

* Apply suggestions from code review

Tabs->spaces

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>

* + Command-line args changed to lowercase
+ Changed tabs->spaces
+ Sorted DeploymentManager includes

* + Command-line args changed to lowercase + Changed tabs->spaces + Sorted DeploymentManager includes

* Fix spaces

* Fixed formatting

* Updated spot version

* Update worker SDK ports (#1549)

* Feature/update platform endpoint (#1553)

* Update worker SDK ports

* Updating platform endpoint

* Update CHANGELOG.md (#1560)

* Fix the third StopDeployments argument (#1563)

* Fix the third StopDeployments argument

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

* Update Version and VersionName in SpatialGDK.uplugin (#1562)

* Update Version and VersionName in SpatialGDK.uplugin

* Update SpatialGDK.uplugin
DW-Sebastien pushed a commit to Darewise/UnrealGDK that referenced this pull request Dec 6, 2019
…rotection

* Feature/UNR-2132 additional endpoint support patch 4.20 (spatialos#1531)

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Added release note

* Update CHANGELOG.md

Co-Authored-By: Oliver Balaam <oliverbalaam@improbable.io>

* FIxes from review

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Updating spatial version

* Modifying Setup.bat to respect china endpoints

Adding endpoint settings to LocalDeploymentManager

* Changing china flag to capital

* Fixed URL based on the console

* Update Setup.bat

Fixing whitespace

* Apply suggestions from code review

+ Formatting suggestions

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>
Co-Authored-By: Joshua Huburn <31517089+joshuahuburn@users.noreply.github.com>

* Update DeploymentLauncher.cs

Whitespace fix

* Some items from the review

* Changed comparison to case-insensitive and using --china to supply argument instead

* Adding --China to shell script also

* Update CHANGELOG.md

Added some more info China flags

* Apply suggestions from code review

Tabs->spaces

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>

* + Command-line args changed to lowercase
+ Changed tabs->spaces
+ Sorted DeploymentManager includes

* + Command-line args changed to lowercase + Changed tabs->spaces + Sorted DeploymentManager includes

* Fix spaces

* Fixed formatting

* Updated spot version

* Update worker SDK ports (spatialos#1549)

* Feature/update platform endpoint (spatialos#1553)

* Update worker SDK ports

* Updating platform endpoint

* Update CHANGELOG.md (spatialos#1560)

* Fix the third StopDeployments argument (spatialos#1563)

* Fix the third StopDeployments argument

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

* Update Version and VersionName in SpatialGDK.uplugin (spatialos#1562)

* Update Version and VersionName in SpatialGDK.uplugin

* Update SpatialGDK.uplugin

# Conflicts:
#	CHANGELOG.md
DW-Sebastien pushed a commit to Darewise/UnrealGDK that referenced this pull request Dec 11, 2019
…rotection

* Feature/UNR-2132 additional endpoint support patch 4.20 (spatialos#1531)

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Adding API endpoints for China.

.NET upgraded to 4.6.1 to link to new Platform SDK

* Added release note

* Update CHANGELOG.md

Co-Authored-By: Oliver Balaam <oliverbalaam@improbable.io>

* FIxes from review

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

Co-Authored-By: Michael Samiec <michaelsamiec@improbable.io>

* Updating spatial version

* Modifying Setup.bat to respect china endpoints

Adding endpoint settings to LocalDeploymentManager

* Changing china flag to capital

* Fixed URL based on the console

* Update Setup.bat

Fixing whitespace

* Apply suggestions from code review

+ Formatting suggestions

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>
Co-Authored-By: Joshua Huburn <31517089+joshuahuburn@users.noreply.github.com>

* Update DeploymentLauncher.cs

Whitespace fix

* Some items from the review

* Changed comparison to case-insensitive and using --china to supply argument instead

* Adding --China to shell script also

* Update CHANGELOG.md

Added some more info China flags

* Apply suggestions from code review

Tabs->spaces

Co-Authored-By: improbable-valentyn <32096431+improbable-valentyn@users.noreply.github.com>

* + Command-line args changed to lowercase
+ Changed tabs->spaces
+ Sorted DeploymentManager includes

* + Command-line args changed to lowercase + Changed tabs->spaces + Sorted DeploymentManager includes

* Fix spaces

* Fixed formatting

* Updated spot version

* Update worker SDK ports (spatialos#1549)

* Feature/update platform endpoint (spatialos#1553)

* Update worker SDK ports

* Updating platform endpoint

* Update CHANGELOG.md (spatialos#1560)

* Fix the third StopDeployments argument (spatialos#1563)

* Fix the third StopDeployments argument

* Update SpatialGDK/Build/Programs/Improbable.Unreal.Scripts/DeploymentLauncher/DeploymentLauncher.cs

* Update Version and VersionName in SpatialGDK.uplugin (spatialos#1562)

* Update Version and VersionName in SpatialGDK.uplugin

* Update SpatialGDK.uplugin
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
jira/UNR size/L Denotes a PR that changes 150-299 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants