Skip to content

Commit 8fd7628

Browse files
Aaron-RitterAaron-Ritter
committed
Merge remote-tracking branch 'refs/remotes/origin/prototype-workspace'
2 parents 9c41f6b + 210053c commit 8fd7628

File tree

9 files changed

+1439
-90
lines changed

9 files changed

+1439
-90
lines changed

‎.github/workflows/codeql-package.yml‎

Lines changed: 15 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL - Package"
132

143
on:
@@ -23,7 +12,7 @@ on:
2312

2413
jobs:
2514
analyze:
26-
name: Analyze (${{ matrix.language }})
15+
name: Analyze (${{ matrix.language }} ${{ matrix.swift }})
2716
# Runner size impacts CodeQL analysis time. To learn more, please see:
2817
# - https://gh.io/recommended-hardware-resources-for-running-codeql
2918
# - https://gh.io/supported-runners-and-hardware-resources
@@ -54,23 +43,21 @@ jobs:
5443
swift: ["5.10.1"]
5544
os: [macos-latest]
5645
xcode: ["15.4"]
57-
include:
58-
- language: swift
59-
build-mode: manual
60-
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
61-
# Use `c-cpp` to analyze code written in C, C++ or both
62-
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
63-
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
46+
language: [swift]
47+
build-mode: [manual]
6448
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
6549
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
6650
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
6751
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
52+
6853
steps:
54+
# This step initializes the in the matrix specified version of Xcode.
6955
- name: Initialize latest xcode
7056
uses: maxim-lobanov/setup-xcode@v1.6.0
7157
with:
7258
xcode-version: ${{ matrix.xcode }}
7359

60+
# This step removes all other versions of Xcode from the machine.
7461
- name: Remove old xcode versions
7562
run: |
7663
echo "Searching for Xcode versions:"
@@ -80,34 +67,31 @@ jobs:
8067
echo "Available Xcode versions after removal:"
8168
find /Applications -name "Xcode_*" -maxdepth 1 -mindepth 1
8269
70+
# Initialize Swift in the matrix specified version.
8371
- name: Initialize Swift
8472
uses: swift-actions/setup-swift@v2.1.0
8573
with:
8674
swift-version: ${{ matrix.swift }}
8775

76+
# Get the Swift version.
8877
- name: Get swift version
8978
run: swift --version
9079

80+
# Checkout the repository.
9181
- name: Checkout repository
9282
uses: actions/checkout@v4.1.7
9383

84+
# Initialize CodeQL.
9485
- name: Initialize CodeQL
9586
uses: github/codeql-action/init@v3.26.6
9687
with:
9788
languages: ${{ matrix.language }}
9889
build-mode: ${{ matrix.build-mode }}
99-
# If you wish to specify custom queries, you can do so here or in a config file.
100-
# By default, queries listed here will override any specified in a config file.
101-
# Prefix the list here with "+" to use these queries and those in the config file.
10290

10391
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
10492
# queries: security-extended,security-and-quality
10593
queries: security-and-quality
10694

107-
# If the analyze step fails for one of the languages you are analyzing with
108-
# "We were unable to automatically build your code", modify the matrix above
109-
# to set the build mode to "manual" for that language. Then modify this step
110-
# to build your code.
11195
# ℹ️ Command-line programs to run using the OS shell.
11296
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
11397

@@ -117,31 +101,19 @@ jobs:
117101
#- name: Autobuild
118102
# uses: github/codeql-action/autobuild@v3.26.5
119103

104+
# Check disk space.
120105
- name: Check Disk Space
121106
run: |
122107
sleep 10
123108
df -h
124109
110+
# Manual build with the release configuration.
125111
- name: Manual build
126-
run: swift build
127-
128-
#- if: matrix.build-mode == 'manual'
129-
# shell: bash
130-
# run: |
131-
# echo 'If you are using a "manual" build mode for one or more of the' \
132-
# 'languages you are analyzing, replace this with the commands to build' \
133-
# 'your code, for example:'
134-
# echo ' make bootstrap'
135-
# echo ' make release'
136-
#
137-
# swift build
138-
#
139-
# echo ' swift build -c release '
140-
#
141-
# exit 1
142-
112+
run: swift build --build-tests --configuration debug -v
143113

114+
# Perform CodeQL analysis after the build has completed successfully or failed.
144115
- name: Perform CodeQL Analysis
145116
uses: github/codeql-action/analyze@v3.26.6
117+
if: success() || failure()
146118
with:
147119
category: "/language:${{matrix.language}}"

‎.github/workflows/codeql-samples-quickstart.yml‎

Lines changed: 14 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# For most projects, this workflow file will not need changing; you simply need
2-
# to commit it to your repository.
3-
#
4-
# You may wish to alter this file to override the set of languages analyzed,
5-
# or to provide custom queries or build logic.
6-
#
7-
# ******** NOTE ********
8-
# We have attempted to detect the languages in your repository. Please check
9-
# the `language` matrix defined below to confirm you have the correct set of
10-
# supported CodeQL languages.
11-
#
121
name: "CodeQL - Sample Quickstart"
132

143
on:
@@ -23,7 +12,7 @@ on:
2312

2413
jobs:
2514
analyze:
26-
name: Analyze (${{ matrix.language }})
15+
name: Analyze (${{ matrix.language }} ${{ matrix.swift }} ${{ matrix.destination }})
2716
# Runner size impacts CodeQL analysis time. To learn more, please see:
2817
# - https://gh.io/recommended-hardware-resources-for-running-codeql
2918
# - https://gh.io/supported-runners-and-hardware-resources
@@ -54,28 +43,24 @@ jobs:
5443
swift: ["5.10.1"]
5544
os: [macos-latest]
5645
xcode: ["15.4"]
46+
language: [swift]
47+
build-mode: [manual]
5748
destination:
58-
- "platform=iOS Simulator,OS=16.4,name=iPhone 14 Pro"
5949
- "platform=iOS Simulator,OS=17.5,name=iPhone 15 Pro"
6050
- "platform=iOS Simulator,OS=18.1,name=iPhone 15 Pro"
61-
- "platform=iOS Simulator,OS=18.1,name=iPhone 15 Pro Max"
62-
include:
63-
- language: swift
64-
build-mode: manual
65-
# CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
66-
# Use `c-cpp` to analyze code written in C, C++ or both
67-
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
68-
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
6951
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
7052
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
7153
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
7254
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
55+
7356
steps:
57+
# Initialize the latest version of Xcode.
7458
- name: Initialize latest xcode
7559
uses: maxim-lobanov/setup-xcode@v1.6.0
7660
with:
7761
xcode-version: ${{ matrix.xcode }}
7862

63+
# Remove any other Xcode version.
7964
- name: Remove old xcode versions
8065
run: |
8166
echo "Searching for Xcode versions:"
@@ -85,35 +70,32 @@ jobs:
8570
echo "Available Xcode versions after removal:"
8671
find /Applications -name "Xcode_*" -maxdepth 1 -mindepth 1
8772
73+
# Initialize Swift in the matrix specified version.
8874
- name: Initialize Swift
8975
uses: swift-actions/setup-swift@v2.1.0
9076
with:
9177
swift-version: ${{ matrix.swift }}
9278

79+
# Get the Swift version.
9380
- name: Get swift version
9481
run: swift --version
9582

83+
# Checkout the repository.
9684
- name: Checkout repository
9785
uses: actions/checkout@v4.1.7
9886

87+
# Initialize CodeQL.
9988
- name: Initialize CodeQL
10089
uses: github/codeql-action/init@v3.26.6
10190
with:
10291
languages: ${{ matrix.language }}
10392
build-mode: ${{ matrix.build-mode }}
104-
# If you wish to specify custom queries, you can do so here or in a config file.
105-
# By default, queries listed here will override any specified in a config file.
106-
# Prefix the list here with "+" to use these queries and those in the config file.
10793

10894
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
10995
# queries: security-extended,security-and-quality
11096
queries: security-and-quality
11197
config-file: .github/codeql/codeql-samples-config.yml
11298

113-
# If the analyze step fails for one of the languages you are analyzing with
114-
# "We were unable to automatically build your code", modify the matrix above
115-
# to set the build mode to "manual" for that language. Then modify this step
116-
# to build your code.
11799
# ℹ️ Command-line programs to run using the OS shell.
118100
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
119101

@@ -123,31 +105,19 @@ jobs:
123105
#- name: Autobuild
124106
# uses: github/codeql-action/autobuild@v3.26.5
125107

108+
# Check Disk Space before the build.
126109
- name: Check Disk Space
127110
run: |
128111
sleep 10
129112
df -h
130113
114+
# Perform the build manually.
131115
- name: Manual Build
132116
run: set -o pipefail && xcodebuild -workspace FusionAuthSDK.xcworkspace/ -scheme fusionauth-quickstart-swift-ios-native -destination "${{matrix.destination}}" -skipPackagePluginValidation
133117

134-
#- if: matrix.build-mode == 'manual'
135-
# shell: bash
136-
# run: |
137-
# echo 'If you are using a "manual" build mode for one or more of the' \
138-
# 'languages you are analyzing, replace this with the commands to build' \
139-
# 'your code, for example:'
140-
# echo ' make bootstrap'
141-
# echo ' make release'
142-
#
143-
# swift build
144-
#
145-
# echo ' swift build -c release '
146-
#
147-
# exit 1
148-
149-
118+
# Perform CodeQL Analysis if the build succeeded or failed.
150119
- name: Perform CodeQL Analysis
151120
uses: github/codeql-action/analyze@v3.26.6
121+
if: success() || failure()
152122
with:
153123
category: "/language:${{matrix.language}}"

‎.github/workflows/mobsf.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
# Sets up the python as a prerequisites for MobSF
3636
- name: Setup python
37-
uses: actions/setup-python@v5.1.1
37+
uses: actions/setup-python@v5.2.0
3838
with:
3939
python-version: 3.8
4040

‎Samples/Quickstart/fusionauth/1.51.2/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
- search_net
4747

4848
fusionauth:
49-
image: fusionauth/fusionauth-app:1.52.1
49+
image: fusionauth/fusionauth-app:1.51.2
5050
depends_on:
5151
db:
5252
condition: service_healthy

‎Samples/Quickstart/fusionauth/1.52.1/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
- search_net
4747

4848
fusionauth:
49-
image: fusionauth/fusionauth-app:1.51.2
49+
image: fusionauth/fusionauth-app:1.52.1
5050
depends_on:
5151
db:
5252
condition: service_healthy

‎Samples/Quickstart/fusionauth/1.53.1/.env‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
POSTGRES_USER=postgres
2+
POSTGRES_PASSWORD=postgres
3+
DATABASE_USERNAME=fusionauth
4+
DATABASE_PASSWORD=hkaLBM3RVnyYeYeqE3WI1w2e4Avpy0Wd5O3s3
5+
OPENSEARCH_JAVA_OPTS="-Xms512m -Xmx512m"
6+
FUSIONAUTH_APP_MEMORY=512M
7+
FUSIONAUTH_APP_RUNTIME_MODE=development
8+
FUSIONAUTH_APP_KICKSTART_FILE=/usr/local/fusionauth/kickstart/kickstart.json

‎Samples/Quickstart/fusionauth/1.53.1/docker-compose.yml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
services:
2+
db:
3+
image: postgres:16.0-bookworm
4+
environment:
5+
PGDATA: /var/lib/postgresql/data/pgdata
6+
POSTGRES_USER: ${POSTGRES_USER}
7+
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
8+
healthcheck:
9+
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
10+
interval: 5s
11+
timeout: 5s
12+
retries: 5
13+
networks:
14+
- db_net
15+
restart: unless-stopped
16+
volumes:
17+
- db_data:/var/lib/postgresql/data
18+
19+
search:
20+
image: opensearchproject/opensearch:2.11.0
21+
environment:
22+
cluster.name: fusionauth
23+
discovery.type: single-node
24+
node.name: search
25+
plugins.security.disabled: true
26+
bootstrap.memory_lock: true
27+
OPENSEARCH_JAVA_OPTS: ${OPENSEARCH_JAVA_OPTS}
28+
healthcheck:
29+
interval: 10s
30+
retries: 80
31+
test: curl --write-out 'HTTP %{http_code}' --fail --silent --output /dev/null http://localhost:9200/
32+
restart: unless-stopped
33+
ulimits:
34+
memlock:
35+
soft: -1
36+
hard: -1
37+
nofile:
38+
soft: 65536
39+
hard: 65536
40+
ports:
41+
- 9200:9200 # REST API
42+
- 9600:9600 # Performance Analyzer
43+
volumes:
44+
- search_data:/usr/share/opensearch/data
45+
networks:
46+
- search_net
47+
48+
fusionauth:
49+
image: fusionauth/fusionauth-app:1.53.1
50+
depends_on:
51+
db:
52+
condition: service_healthy
53+
search:
54+
condition: service_healthy
55+
environment:
56+
DATABASE_URL: jdbc:postgresql://db:5432/fusionauth
57+
DATABASE_ROOT_USERNAME: ${POSTGRES_USER}
58+
DATABASE_ROOT_PASSWORD: ${POSTGRES_PASSWORD}
59+
DATABASE_USERNAME: ${DATABASE_USERNAME}
60+
DATABASE_PASSWORD: ${DATABASE_PASSWORD}
61+
FUSIONAUTH_APP_MEMORY: ${FUSIONAUTH_APP_MEMORY}
62+
FUSIONAUTH_APP_RUNTIME_MODE: ${FUSIONAUTH_APP_RUNTIME_MODE}
63+
FUSIONAUTH_APP_URL: http://fusionauth:9011
64+
SEARCH_SERVERS: http://search:9200
65+
SEARCH_TYPE: elasticsearch
66+
FUSIONAUTH_APP_KICKSTART_FILE: ${FUSIONAUTH_APP_KICKSTART_FILE}
67+
networks:
68+
- db_net
69+
- search_net
70+
restart: unless-stopped
71+
ports:
72+
- 9011:9011
73+
volumes:
74+
- fusionauth_config:/usr/local/fusionauth/config
75+
- ./kickstart:/usr/local/fusionauth/kickstart
76+
77+
networks:
78+
db_net:
79+
driver: bridge
80+
search_net:
81+
driver: bridge
82+
83+
volumes:
84+
db_data:
85+
fusionauth_config:
86+
search_data:

0 commit comments

Comments
 (0)