Skip to content

Commit 5125987

Browse files
authored
Merge branch 'main' into main
2 parents 26c4105 + 10bb887 commit 5125987

File tree

8 files changed

+66
-27
lines changed

8 files changed

+66
-27
lines changed

.github/solutionid_validator.sh

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/sh
2+
#set -e
3+
4+
echo "checking solution id $1"
5+
echo "grep -nr --exclude-dir='.github' "$1" ./.."
6+
result=$(grep -nr --exclude-dir='.github' "$1" ./..)
7+
if [ $? -eq 0 ]
8+
then
9+
echo "Solution ID $1 found\n"
10+
echo "$result"
11+
exit 0
12+
else
13+
echo "Solution ID $1 not found"
14+
exit 1
15+
fi
16+
17+
export result
+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Workflows managed by aws-solutions-library-samples maintainers
2+
name: Maintainer Workflows
3+
on:
4+
# Triggers the workflow on push or pull request events but only for the "main" branch
5+
push:
6+
branches: [ "main" ]
7+
pull_request:
8+
branches: [ "main" ]
9+
types: [opened, reopened, edited]
10+
11+
jobs:
12+
CheckSolutionId:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Run solutionid validator
17+
run: |
18+
chmod u+x ./.github/solutionid_validator.sh
19+
./.github/solutionid_validator.sh ${{ vars.SOLUTIONID }}

BackendComponentSamples/NodeJsFargateApi/package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BackendComponentSamples/package-lock.json

+8-8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BackendFeatures/AmazonGameLiftIntegration/package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

BackendFeatures/SimpleWebsocketChat/SimpleWebsocketApp/package-lock.json

+7-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CODEOWNERS

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
CODEOWNERS @aws-solutions-library-samples/maintainers
2+
/.github/workflows/maintainer_workflows.yml @aws-solutions-library-samples/maintainers
3+
/.github/solutionid_validator.sh @aws-solutions-library-samples/maintainers

GodotSample/AWSGameSDK/AWSGameSDK.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class UserInfo:
1717
var refresh_token_expires_in = "";
1818

1919
func _to_string():
20-
print("user_id: " + user_id + "\nguest_secret: " + guest_secret + "\nauth_token: " + auth_token +
20+
return("user_id: " + user_id + "\nguest_secret: " + guest_secret + "\nauth_token: " + auth_token +
2121
"\napple_id: " + apple_id + "\nsteam_id: " + steam_id + "\ngoogle_play_id: " + google_play_id
2222
+ "\nfacebook_id: " + facebook_id
2323
+ "\nrefresh_token: " + refresh_token + "\nauth_token_expires_in: " + str(auth_token_expires_in)

0 commit comments

Comments
 (0)