Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: replace aws-ee package name prefix with amzn #960

Merged
merged 15 commits into from
Apr 5, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
33337ef
update pipeline config
maghirardelli Nov 19, 2021
207052e
fix: unhandled workflow error (#852)
SanketD92 Jan 5, 2022
f17c94e
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Jan 12, 2022
97498a2
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Jan 20, 2022
c4cc145
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Jan 24, 2022
6aaca4c
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Jan 28, 2022
4562721
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Feb 7, 2022
415b8d8
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Feb 11, 2022
bbd2ee4
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Feb 14, 2022
d2db8a8
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Feb 22, 2022
b88e64c
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Feb 25, 2022
94c3029
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Mar 7, 2022
8dbca28
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Mar 15, 2022
d26eab4
Merge branch 'develop' of https://github.com/awslabs/service-workbenc…
maghirardelli Apr 4, 2022
befb32d
fix: replace aws-ee prefix with amzn
maghirardelli Apr 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* permissions and limitations under the License.
*/

const Service = require('@aws-ee/base-services-container/lib/service');
const { runAndCatch } = require('@aws-ee/base-services/lib/helpers/utils');
const Service = require('@amzn/base-services-container/lib/service');
const { runAndCatch } = require('@amzn/base-services/lib/helpers/utils');

const createOrUpdateSchema = require('./schema/deployment-item.json');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
* permissions and limitations under the License.
*/

const AwsService = require('@aws-ee/base-services/lib/aws/aws-service');
const S3Service = require('@aws-ee/base-services/lib/s3-service');
const IamService = require('@aws-ee/base-services/lib/iam/iam-service');
const DbService = require('@aws-ee/base-services/lib/db-service');
const JsonSchemaValidationService = require('@aws-ee/base-services/lib/json-schema-validation-service');
const InputManifestValidationService = require('@aws-ee/base-services/lib/input-manifest/input-manifest-validation-service');
const LockService = require('@aws-ee/base-services/lib/lock/lock-service');
const PluginRegistryService = require('@aws-ee/base-services/lib/plugin-registry/plugin-registry-service');
const AuditWriterService = require('@aws-ee/base-services/lib/audit/audit-writer-service');
const AuthorizationService = require('@aws-ee/base-services/lib/authorization/authorization-service');
const UserAuthzService = require('@aws-ee/base-services/lib/user/user-authz-service');
const UserService = require('@aws-ee/base-services/lib/user/user-service');
const DbPasswordService = require('@aws-ee/base-services/lib/db-password/db-password-service');
const AuthenticationProviderTypeService = require('@aws-ee/base-api-services/lib/authentication-providers/authentication-provider-type-service');
const AuthenticationProviderConfigService = require('@aws-ee/base-api-services/lib/authentication-providers/authentication-provider-config-service');
const registerBuiltInAuthProvisioners = require('@aws-ee/base-api-services/lib/authentication-providers/register-built-in-provisioner-services');
const AwsService = require('@amzn/base-services/lib/aws/aws-service');
const S3Service = require('@amzn/base-services/lib/s3-service');
const IamService = require('@amzn/base-services/lib/iam/iam-service');
const DbService = require('@amzn/base-services/lib/db-service');
const JsonSchemaValidationService = require('@amzn/base-services/lib/json-schema-validation-service');
const InputManifestValidationService = require('@amzn/base-services/lib/input-manifest/input-manifest-validation-service');
const LockService = require('@amzn/base-services/lib/lock/lock-service');
const PluginRegistryService = require('@amzn/base-services/lib/plugin-registry/plugin-registry-service');
const AuditWriterService = require('@amzn/base-services/lib/audit/audit-writer-service');
const AuthorizationService = require('@amzn/base-services/lib/authorization/authorization-service');
const UserAuthzService = require('@amzn/base-services/lib/user/user-authz-service');
const UserService = require('@amzn/base-services/lib/user/user-service');
const DbPasswordService = require('@amzn/base-services/lib/db-password/db-password-service');
const AuthenticationProviderTypeService = require('@amzn/base-api-services/lib/authentication-providers/authentication-provider-type-service');
const AuthenticationProviderConfigService = require('@amzn/base-api-services/lib/authentication-providers/authentication-provider-config-service');
const registerBuiltInAuthProvisioners = require('@amzn/base-api-services/lib/authentication-providers/register-built-in-provisioner-services');

const DeploymentStoreService = require('../deployment-store-service');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
* permissions and limitations under the License.
*/

const ServicesContainer = require('@aws-ee/base-services-container/lib/services-container');
const Aws = require('@aws-ee/base-services/lib/aws/aws-service');
const JsonSchemaValidationService = require('@aws-ee/base-services/lib/json-schema-validation-service');
const ServicesContainer = require('@amzn/base-services-container/lib/services-container');
const Aws = require('@amzn/base-services/lib/aws/aws-service');
const JsonSchemaValidationService = require('@amzn/base-services/lib/json-schema-validation-service');
const AWSMock = require('aws-sdk-mock');
const Logger = require('@aws-ee/base-services/lib/logger/logger-service');
const Logger = require('@amzn/base-services/lib/logger/logger-service');

// Mocked dependencies

jest.mock('@aws-ee/base-services/lib/db-password/db-password-service');
const DbPasswordServiceMock = require('@aws-ee/base-services/lib/db-password/db-password-service');
jest.mock('@amzn/base-services/lib/db-password/db-password-service');
const DbPasswordServiceMock = require('@amzn/base-services/lib/db-password/db-password-service');

jest.mock('@aws-ee/base-services/lib/user/user-service');
const UserServiceMock = require('@aws-ee/base-services/lib/user/user-service');
jest.mock('@amzn/base-services/lib/user/user-service');
const UserServiceMock = require('@amzn/base-services/lib/user/user-service');

jest.mock('@aws-ee/base-services/lib/settings/env-settings-service');
const SettingsServiceMock = require('@aws-ee/base-services/lib/settings/env-settings-service');
jest.mock('@amzn/base-services/lib/settings/env-settings-service');
const SettingsServiceMock = require('@amzn/base-services/lib/settings/env-settings-service');

const CreateRootUserService = require('../create-root-user-service');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*/

const _ = require('lodash');
const Service = require('@aws-ee/base-services-container/lib/service');
const { getSystemRequestContext } = require('@aws-ee/base-services/lib/helpers/system-context');
const authProviderConstants = require('@aws-ee/base-api-services/lib/authentication-providers/constants')
const Service = require('@amzn/base-services-container/lib/service');
const { getSystemRequestContext } = require('@amzn/base-services/lib/helpers/system-context');
const authProviderConstants = require('@amzn/base-api-services/lib/authentication-providers/constants')
.authenticationProviders;

const settingKeys = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* permissions and limitations under the License.
*/

const Service = require('@aws-ee/base-services-container/lib/service');
const Service = require('@amzn/base-services-container/lib/service');
const passwordGenerator = require('generate-password');

const settingKeys = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@

const _ = require('lodash');
const passwordGenerator = require('generate-password');
const Service = require('@aws-ee/base-services-container/lib/service');
const { getSystemRequestContext } = require('@aws-ee/base-services/lib/helpers/system-context');
const Service = require('@amzn/base-services-container/lib/service');
const { getSystemRequestContext } = require('@amzn/base-services/lib/helpers/system-context');

const settingKeys = {
paramStoreJwtSecret: 'paramStoreJwtSecret',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@aws-ee/base-post-deployment",
"name": "@amzn/base-post-deployment",
"version": "1.0.0",
"private": true,
"description": "A library containing base set of post-deployment steps",
"author": "Amazon Web Services",
"license": "Apache-2.0",
"dependencies": {
"@aws-ee/base-api-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/base-services-container": "workspace:*",
"@amzn/base-api-services": "workspace:*",
"@amzn/base-services": "workspace:*",
"@amzn/base-services-container": "workspace:*",
"aws-sdk": "^2.1000.0",
"generate-password": "^1.5.0",
"lodash": "^4.17.21"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* permissions and limitations under the License.
*/

const Service = require('@aws-ee/base-services-container/lib/service');
const { runAndCatch } = require('@aws-ee/base-services/lib/helpers/utils');
const Service = require('@amzn/base-services-container/lib/service');
const { runAndCatch } = require('@amzn/base-services/lib/helpers/utils');

const createOrUpdateSchema = require('./schema/deployment-item.json');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,22 @@
* permissions and limitations under the License.
*/

const AwsService = require('@aws-ee/base-services/lib/aws/aws-service');
const S3Service = require('@aws-ee/base-services/lib/s3-service');
const IamService = require('@aws-ee/base-services/lib/iam/iam-service');
const DbService = require('@aws-ee/base-services/lib/db-service');
const JsonSchemaValidationService = require('@aws-ee/base-services/lib/json-schema-validation-service');
const InputManifestValidationService = require('@aws-ee/base-services/lib/input-manifest/input-manifest-validation-service');
const LockService = require('@aws-ee/base-services/lib/lock/lock-service');
const PluginRegistryService = require('@aws-ee/base-services/lib/plugin-registry/plugin-registry-service');
const AuditWriterService = require('@aws-ee/base-services/lib/audit/audit-writer-service');
const AuthorizationService = require('@aws-ee/base-services/lib/authorization/authorization-service');
const UserAuthzService = require('@aws-ee/base-services/lib/user/user-authz-service');
const UserService = require('@aws-ee/base-services/lib/user/user-service');
const DbPasswordService = require('@aws-ee/base-services/lib/db-password/db-password-service');
const AuthenticationProviderTypeService = require('@aws-ee/base-api-services/lib/authentication-providers/authentication-provider-type-service');
const AuthenticationProviderConfigService = require('@aws-ee/base-api-services/lib/authentication-providers/authentication-provider-config-service');
const registerBuiltInAuthProvisioners = require('@aws-ee/base-api-services/lib/authentication-providers/register-built-in-provisioner-services');
const AwsService = require('@amzn/base-services/lib/aws/aws-service');
const S3Service = require('@amzn/base-services/lib/s3-service');
const IamService = require('@amzn/base-services/lib/iam/iam-service');
const DbService = require('@amzn/base-services/lib/db-service');
const JsonSchemaValidationService = require('@amzn/base-services/lib/json-schema-validation-service');
const InputManifestValidationService = require('@amzn/base-services/lib/input-manifest/input-manifest-validation-service');
const LockService = require('@amzn/base-services/lib/lock/lock-service');
const PluginRegistryService = require('@amzn/base-services/lib/plugin-registry/plugin-registry-service');
const AuditWriterService = require('@amzn/base-services/lib/audit/audit-writer-service');
const AuthorizationService = require('@amzn/base-services/lib/authorization/authorization-service');
const UserAuthzService = require('@amzn/base-services/lib/user/user-authz-service');
const UserService = require('@amzn/base-services/lib/user/user-service');
const DbPasswordService = require('@amzn/base-services/lib/db-password/db-password-service');
const AuthenticationProviderTypeService = require('@amzn/base-api-services/lib/authentication-providers/authentication-provider-type-service');
const AuthenticationProviderConfigService = require('@amzn/base-api-services/lib/authentication-providers/authentication-provider-config-service');
const registerBuiltInAuthProvisioners = require('@amzn/base-api-services/lib/authentication-providers/register-built-in-provisioner-services');

const DeploymentStoreService = require('../deployment-store-service');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
*/

const _ = require('lodash');
const Service = require('@aws-ee/base-services-container/lib/service');
const Service = require('@amzn/base-services-container/lib/service');

const { getSystemRequestContext } = require('@aws-ee/base-services/lib/helpers/system-context');
const { getSystemRequestContext } = require('@amzn/base-services/lib/helpers/system-context');

const settingKeys = {
enableEgressStore: 'enableEgressStore',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "@aws-ee/base-pre-deployment",
"name": "@amzn/base-pre-deployment",
"version": "1.0.0",
"private": true,
"description": "A library containing base set of pre-deployment steps",
"author": "Amazon Web Services",
"license": "Apache-2.0",
"dependencies": {
"@aws-ee/base-api-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@aws-ee/base-services-container": "workspace:*",
"@amzn/base-api-services": "workspace:*",
"@amzn/base-services": "workspace:*",
"@amzn/base-services-container": "workspace:*",
"aws-sdk": "^2.1000.0",
"generate-password": "^1.5.0",
"lodash": "^4.17.21"
Expand Down
2 changes: 1 addition & 1 deletion addons/addon-base-raas-appstream/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# @aws-ee/base-raas-appstream-cfn-templates, @aws-ee/base-raas-appstream-rest-api and @aws-ee/base-raas-appstream-services
# @amzn/base-raas-appstream-cfn-templates, @amzn/base-raas-appstream-rest-api and @amzn/base-raas-appstream-services

These packages implement the server side changes to RaaS to secure workspaces using AppStream. AppStream is deployed in the on-boarded research account. Rather than returning the workspace connection URL, these changes return the url to an AppStream session (per user-environment pair) that will provide access to the workspace.
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
* permissions and limitations under the License.
*/

const AppStreamScEnvConfigVarsService = require('@aws-ee/base-raas-appstream-services/lib/appstream/appstream-sc-env-config-vars-service');
const AppStreamScService = require('@aws-ee/base-raas-appstream-services/lib/appstream/appstream-sc-service');
const AppStreamScEnvConfigVarsService = require('@amzn/base-raas-appstream-services/lib/appstream/appstream-sc-env-config-vars-service');
const AppStreamScService = require('@amzn/base-raas-appstream-services/lib/appstream/appstream-sc-service');

/**
* Registers the services needed by the workflow loop runner lambda function
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "@aws-ee/base-raas-appstream-rest-api",
"name": "@amzn/base-raas-appstream-rest-api",
"private": true,
"version": "1.0.0",
"description": "A library containing a set of base RaaS AppStream related controllers",
"author": "Amazon Web Services",
"license": "Apache-2.0",
"dependencies": {
"@aws-ee/base-controllers": "workspace:*",
"@aws-ee/base-raas-appstream-services": "workspace:*",
"@aws-ee/base-raas-services": "workspace:*",
"@aws-ee/base-services": "workspace:*",
"@amzn/base-controllers": "workspace:*",
"@amzn/base-raas-appstream-services": "workspace:*",
"@amzn/base-raas-services": "workspace:*",
"@amzn/base-services": "workspace:*",
"lodash": "^4.17.21"
},
"devDependencies": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
* permissions and limitations under the License.
*/

const Service = require('@aws-ee/base-services-container/lib/service');
const Service = require('@amzn/base-services-container/lib/service');
/**
* Creation of Environment Type Configuration requires specifying mapping between AWS CloudFormation Input Parameters
* and predefined values. Many times, the values are not available at the time of creating this mapping. In such cases,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*/

const _ = require('lodash');
const Service = require('@aws-ee/base-services-container/lib/service');
const Service = require('@amzn/base-services-container/lib/service');

class AppStreamScService extends Service {
constructor() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@
* permissions and limitations under the License.
*/

const ServicesContainer = require('@aws-ee/base-services-container/lib/services-container');
const AwsService = require('@aws-ee/base-services/lib/aws/aws-service');
const ServicesContainer = require('@amzn/base-services-container/lib/services-container');
const AwsService = require('@amzn/base-services/lib/aws/aws-service');

const AWSMock = require('aws-sdk-mock');

jest.mock('@aws-ee/base-raas-services/lib/aws-accounts/aws-accounts-service');
const AwsAccountsServiceMock = require('@aws-ee/base-raas-services/lib/aws-accounts/aws-accounts-service');
jest.mock('@amzn/base-raas-services/lib/aws-accounts/aws-accounts-service');
const AwsAccountsServiceMock = require('@amzn/base-raas-services/lib/aws-accounts/aws-accounts-service');

jest.mock('@aws-ee/base-raas-services/lib/indexes/indexes-service');
const IndexesServiceMock = require('@aws-ee/base-raas-services/lib/indexes/indexes-service');
jest.mock('@amzn/base-raas-services/lib/indexes/indexes-service');
const IndexesServiceMock = require('@amzn/base-raas-services/lib/indexes/indexes-service');

jest.mock('@aws-ee/base-services/lib/audit/audit-writer-service');
const AuditServiceMock = require('@aws-ee/base-services/lib/audit/audit-writer-service');
jest.mock('@amzn/base-services/lib/audit/audit-writer-service');
const AuditServiceMock = require('@amzn/base-services/lib/audit/audit-writer-service');

jest.mock('@aws-ee/base-raas-services/lib/environment/service-catalog/environment-sc-service');
const EnvironmentScServiceMock = require('@aws-ee/base-raas-services/lib/environment/service-catalog/environment-sc-service');
jest.mock('@amzn/base-raas-services/lib/environment/service-catalog/environment-sc-service');
const EnvironmentScServiceMock = require('@amzn/base-raas-services/lib/environment/service-catalog/environment-sc-service');

jest.mock('@aws-ee/base-raas-services/lib/environment/service-catalog/environment-sc-keypair-service');
const EnvironmentScKeyPairServiceMock = require('@aws-ee/base-raas-services/lib/environment/service-catalog/environment-sc-keypair-service');
jest.mock('@amzn/base-raas-services/lib/environment/service-catalog/environment-sc-keypair-service');
const EnvironmentScKeyPairServiceMock = require('@amzn/base-raas-services/lib/environment/service-catalog/environment-sc-keypair-service');

jest.mock('@aws-ee/base-services/lib/settings/env-settings-service');
const SettingsServiceMock = require('@aws-ee/base-services/lib/settings/env-settings-service');
jest.mock('@amzn/base-services/lib/settings/env-settings-service');
const SettingsServiceMock = require('@amzn/base-services/lib/settings/env-settings-service');

jest.mock('@aws-ee/base-services/lib/logger/logger-service');
const Logger = require('@aws-ee/base-services/lib/logger/logger-service');
jest.mock('@amzn/base-services/lib/logger/logger-service');
const Logger = require('@amzn/base-services/lib/logger/logger-service');

const AppStreamScService = require('../appstream-sc-service');

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
* permissions and limitations under the License.
*/

const ServicesContainer = require('@aws-ee/base-services-container/lib/services-container');
const ServicesContainer = require('@amzn/base-services-container/lib/services-container');

// Mocked dependencies
jest.mock('@aws-ee/base-services/lib/plugin-registry/plugin-registry-service');
const PluginRegistryService = require('@aws-ee/base-services/lib/plugin-registry/plugin-registry-service');
jest.mock('@amzn/base-services/lib/plugin-registry/plugin-registry-service');
const PluginRegistryService = require('@amzn/base-services/lib/plugin-registry/plugin-registry-service');

jest.mock('@aws-ee/base-services/lib/settings/env-settings-service');
const SettingsServiceMock = require('@aws-ee/base-services/lib/settings/env-settings-service');
jest.mock('@amzn/base-services/lib/settings/env-settings-service');
const SettingsServiceMock = require('@amzn/base-services/lib/settings/env-settings-service');

jest.mock('@aws-ee/base-raas-services/lib/environment/service-catalog/environment-sc-service');
const EnvironmentScServiceMock = require('@aws-ee/base-raas-services/lib/environment/service-catalog/environment-sc-service');
jest.mock('@amzn/base-raas-services/lib/environment/service-catalog/environment-sc-service');
const EnvironmentScServiceMock = require('@amzn/base-raas-services/lib/environment/service-catalog/environment-sc-service');

jest.mock('@aws-ee/base-raas-services/lib/indexes/indexes-service');
const IndexesServiceMock = require('@aws-ee/base-raas-services/lib/indexes/indexes-service');
jest.mock('@amzn/base-raas-services/lib/indexes/indexes-service');
const IndexesServiceMock = require('@amzn/base-raas-services/lib/indexes/indexes-service');

const plugin = require('../aws-account-mgmt-plugin');

Expand Down
Loading