birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,634 Commits 3 Branches 3 Tags
daeab4bbb112755d9c4eabc8cdac3f92fec5202e
Commit Graph

26 Commits

Author SHA1 Message Date
allisaurus 704aef8cad Add pytest to Resource Mapping Tool requirements.txt (#6259) 
* Add pytest to Resource Mapping Tool requirements.txt

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
 2021-12-21 11:11:45 -08:00
allisaurus 5fd68cf1c2 Let resource mapping tool save resources without an account ID (#6262) 
* Let resource mapping tool save resources without an account ID

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
 2021-12-10 13:20:09 -08:00
Junbo Liang f94c0113ab Merge commit '3cf3e45b38d66269862c47d482e2f794a7f6418f' into junbo/gitflow_211123_o3de 2021-11-23 13:21:05 -08:00
Vincent Liu 423e2e8da8 Unify resource mapping json schema across cpp and python usage (#5799) 
* Unify resource mapping json schema across cpp and python usage

Signed-off-by: onecent1101 <liug@amazon.com>

* Update based on feedback

Signed-off-by: onecent1101 <liug@amazon.com>

* Add empty line at end of file

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-11-23 12:06:39 -08:00
Esteban Papp ccb5336843 Reading 3rdparty from manifest if it exists (#5840) 
* Reading 3rdparty from manifest if it exists, removnig the need to pass it across the board, updated jenkins paths so 3rdparty is put into the workspace

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Removes unneded space

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Changes how we get the NDK folder

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs delayed expansion

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Ninja is in the path, is not needed for Android

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-22 14:21:02 -08:00
Steve Pham 3cf3e45b38 Enable Resource Mapping Tool on Linux (#5779) 
* Enable and fix AWS Resource Mapping Tool on Linux
- Enable the trait AWSCORE_EDITOR_RESOURCE_MAPPING_TOOL_ENABLED for Linux
- Add additional traits to handle launching o3de local python on Linux
- Update the resource_mapping_tool.py to support preloading the shared libraries for Pyside (like the QtForPython gem) in order to resolve the local pyside2 libraries

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update pyside2 to a RUNTIME dependency

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Update special linux preloading comments for clarity

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Add CR at the end of traits files

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* - Remove unnecessary extra argument '--executable-path' and use '--binaries-path' instead
- Add linux only loading of pyside modules to 'setup_qt_environment' instead
- Update README.md

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Updated unit tests for test_environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Fix (more) indentation for Linux specific logic in environment_utils.py

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>

* Replace exit with return in setup_qt_environment

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-11-19 12:09:00 -08:00
allisaurus edb15946ca Update resource mapping tool schema version (#5729) 
* Update resource mapping tool schema version

Signed-off-by: allisaurus <34254888+allisaurus@users.noreply.github.com>
 2021-11-18 14:35:24 -08:00
Junbo Liang b8f7767cd6 [Resource Mapping Tool] make top-level Account id optional in ResourceMapping tool schema (#5569) 
* [Resource Mapping Tool] make top-level Account id optional in ResourceMapping tool schema

Signed-off-by: junbo75 <68558268+junbo75@users.noreply.github.com>
 2021-11-11 16:11:52 -08:00
Junbo Liang 9fc824d98b Create config files automatically and UX style updates (#3514) 2021-08-31 11:15:04 -07:00
Junbo Liang 6d5d042e40 Set the default region for the Resource Mapping Tool when no region is configured via AWS CLI (#2856) 
Ensure a valid region is always present when generating resource mapping files.
 2021-08-12 10:05:13 -07:00
Vincent Liu 89602aaa63 [SPEC-7931] Filter list_buckets results based on region during import (#2950) 
Filter s3 list_buckets results based on region correctly to improve resource import.

Signed-off-by: onecent1101 <liug@amazon.com>
 2021-08-09 13:06:28 -07:00
Vincent Liu 8e3b25e606 [LYN-5268] Copy resource mapping tool to install target and add argument for log path (#2819) 
Updates to make resource mapping tool work with the installer. Ensure correct log path.
 2021-08-06 12:03:36 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213) 
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
 2021-07-16 15:25:48 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693) 
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
 2021-06-30 19:51:55 -07:00
Danilo Aimini 7030f663f5 LYN-4890 | Change all instances of teal blue to correct O3DE branding palette colors (#1672) 
* Replace old teal color with correct palette colors from the O3DE branding.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>

* Fix hyperlink color in O3DE About Us dialog to improve visibility.

Signed-off-by: Danilo Aimini <82231674+AMZN-daimini@users.noreply.github.com>
 2021-06-30 15:20:42 -07:00
Vincent Liu bd9c0d41b8 [LYN-4743] Add CFN resource attribute key check (#1528) 2021-06-24 12:01:11 -07:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
Vincent Liu ac8ee00aff [LYN-4288] Adding error page if resource mapping tool has invalid setup (#1219) 2021-06-09 19:29:34 -07:00
Vincent Liu ba02652e63 [LYN-4200] Fail and log error if required aws config file is not found (#1099) 2021-06-03 10:59:11 -07:00
Vincent Liu 9fb4ce59c4 [LYN-2151] Add argument to override aws profile and config file path (#994) 2021-05-28 12:19:17 -07:00
Vincent Liu 87a8f0ddca [LYN-2969] Update resource mapping tool with O3DE icon (#898) 2021-05-25 12:34:08 -07:00
Vincent Liu 9f9b8f70b4 [LYN-3149] Update AWSCore Editor menu to invoke resource mapping tool through engine python environment (#318) 
## Details
After migrating to engine python environment, there is no extra step required to launch resource mapping tool in editor.
1. This change is to migrate the editor tool launching process to engine python environment.
2. Add messagebox to show errors while using the tool
3. Note - as Qt binaries are not well organized in build directory, so separate out *AWSCore.ResourceMappintTool* target to group Qt binaries into independent build sub folder to solve the issue (temporarily, fix can be tracked by https://jira.agscollab.com/browse/LYN-2669, once fix is done, we can just remove this individual target)

## Testing
Runs AWSCore.Editor.Tests
```
[----------] Global test environment tear-down
[==========] 8 tests from 4 test cases ran. (161 ms total)
[  PASSED  ] 8 tests.
```
 2021-04-28 11:28:23 -07:00
Vincent Liu a4e1abf6df [LYN-2470] Integrate resource mapping tool with engine python environment (#17) 
1. Add support to use engine python runtime environment. Ideally we should use project executable directory which contains required qt binaries after build. But currently Qt plugins are not put under proper subdirectory which causes huge overhead of loading plugin binaries (see details in this jira https://jira.agscollab.com/browse/LYN-2669 ). The temporary solution is to use AWSCore.Editor target to create a subdirectory for our use case.   
2. **Minor Fix** After migrating to engine python environment, see boto3 warning while using debug mode, seems like a existing issue for a long time https://github.com/boto/boto3/issues/454. Register a after call event to close connection   
3. **Minor Fix** After migrating to engine python environment, see Qt multithread warning while using debug mode, change direct setter function call to qt signal
 2021-04-23 11:34:37 -07:00
alexpete c2cbd430fe Integrating up through commit 90f050496 2021-04-07 14:03:29 -07:00
Brian Herrera e8bbb5a0d5 Set scripts to be executable 
This is required to build on linux/mac
 2021-03-26 09:26:12 -07:00
alexpete 75dc720198 Integrating latest 47acbe8 2021-03-25 13:57:57 -07:00