Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
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
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This is the Modular Go framework - a structured way to create modular applicatio
## Development Workflow

### Local Development Setup
1. Clone the repository: `git clone https://github.com/CrisisTextLine/modular.git`
1. Clone the repository: `git clone https://github.com/GoCodeAlone/modular.git`
2. Install Go 1.23.0 or later (toolchain uses 1.24.2)
3. Install golangci-lint: `go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest`
4. Run tests to verify setup: `go test ./... -v`
Expand Down Expand Up @@ -153,7 +153,7 @@ Working example applications:
### CLI Tool (`modcli`)
- Generate new modules: `modcli generate module --name MyModule`
- Generate configurations: `modcli generate config --name MyConfig`
- Install with: `go install github.com/CrisisTextLine/modular/cmd/modcli@latest`
- Install with: `go install github.com/GoCodeAlone/modular/cmd/modcli@latest`

### Debugging Tools
- Debug module interfaces: `modular.DebugModuleInterfaces(app, "module-name")`
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/auto-bump-modules.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
check-latest: true

- name: Determine version
Expand All @@ -63,12 +63,12 @@ jobs:
[ -f "$mod" ] || continue
dir=$(dirname "$mod")
# If the require line exists with a version different from CORE, update via go mod edit (portable, avoids sed incompat)
if grep -q "github.com/CrisisTextLine/modular v" "$mod" && ! grep -q "github.com/CrisisTextLine/modular ${CORE}" "$mod"; then
(cd "$dir" && go mod edit -require=github.com/CrisisTextLine/modular@${CORE})
if grep -q "github.com/GoCodeAlone/modular v" "$mod" && ! grep -q "github.com/GoCodeAlone/modular ${CORE}" "$mod"; then
(cd "$dir" && go mod edit -require=github.com/GoCodeAlone/modular@${CORE})
UPDATED=1
fi
# Drop any replace directive pointing to local modular path to avoid accidental pinning
(cd "$dir" && go mod edit -dropreplace=github.com/CrisisTextLine/modular 2>/dev/null || true)
(cd "$dir" && go mod edit -dropreplace=github.com/GoCodeAlone/modular 2>/dev/null || true)
done
if [ "$UPDATED" = 0 ]; then
echo "No module files needed updating"
Expand Down Expand Up @@ -114,10 +114,10 @@ jobs:
run: |
set -euo pipefail
CORE=${{ steps.ver.outputs.core_version }}
OLD=$(git grep -h -o 'github.com/CrisisTextLine/modular v[0-9]\+\.[0-9]\+\.[0-9]\+' -- '*.md' | grep -v $CORE | head -n1 | awk '{print $1}' || true)
OLD=$(git grep -h -o 'github.com/GoCodeAlone/modular v[0-9]\+\.[0-9]\+\.[0-9]\+' -- '*.md' | grep -v $CORE | head -n1 | awk '{print $1}' || true)
# Replace any explicit old version with current in markdown examples
if [ -n "$OLD" ]; then
find . -name '*.md' -print0 | xargs -0 sed -i "" -E "s#github.com/CrisisTextLine/modular v[0-9]+\.[0-9]+\.[0-9]+#github.com/CrisisTextLine/modular ${CORE}#g" || find . -name '*.md' -print0 | xargs -0 sed -i -E "s#github.com/CrisisTextLine/modular v[0-9]+\.[0-9]+\.[0-9]+#github.com/CrisisTextLine/modular ${CORE}#g"
find . -name '*.md' -print0 | xargs -0 sed -i "" -E "s#github.com/GoCodeAlone/modular v[0-9]+\.[0-9]+\.[0-9]+#github.com/GoCodeAlone/modular ${CORE}#g" || find . -name '*.md' -print0 | xargs -0 sed -i -E "s#github.com/GoCodeAlone/modular v[0-9]+\.[0-9]+\.[0-9]+#github.com/GoCodeAlone/modular ${CORE}#g"
fi

- name: Create PR
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/bdd-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
workflow_dispatch:

env:
GO_VERSION: '^1.25'
GO_VERSION: '^1.26'

jobs:
# Discover modules (reused for matrix)
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
files: core-bdd-coverage.txt
flags: core-bdd
- name: Persist core BDD coverage artifact
Expand Down Expand Up @@ -127,7 +127,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
files: modules/${{ matrix.module }}/bdd-${{ matrix.module }}-coverage.txt
flags: bdd-${{ matrix.module }}
- name: Persist module BDD coverage artifact
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
files: merged-bdd-coverage.txt
flags: merged-bdd
- name: Persist merged BDD coverage artifact
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
branches: [ main ]

env:
GO_VERSION: '^1.25'
GO_VERSION: '^1.26'

jobs:
test:
Expand Down Expand Up @@ -43,7 +43,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
files: coverage.txt
flags: unit
- name: Upload unit coverage artifact
Expand Down Expand Up @@ -94,7 +94,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
directory: cmd/modcli/
files: cli-coverage.txt
flags: cli
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
files: total-coverage.txt
flags: total
fail_ci_if_error: true
6 changes: 3 additions & 3 deletions .github/workflows/cli-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ on:
default: 'patch'

env:
GO_VERSION: '^1.25'
GO_VERSION: '^1.26'

permissions:
contents: write
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
- name: Build
run: |
cd cmd/modcli
go build -v -ldflags "-X github.com/CrisisTextLine/modular/cmd/modcli/cmd.Version=${{ needs.prepare.outputs.version }} -X github.com/CrisisTextLine/modular/cmd/modcli/cmd.Commit=${{ github.sha }} -X github.com/CrisisTextLine/modular/cmd/modcli/cmd.Date=$(date +'%Y-%m-%d')" -o ${{ matrix.artifact_name }}
go build -v -ldflags "-X github.com/GoCodeAlone/modular/cmd/modcli/cmd.Version=${{ needs.prepare.outputs.version }} -X github.com/GoCodeAlone/modular/cmd/modcli/cmd.Commit=${{ github.sha }} -X github.com/GoCodeAlone/modular/cmd/modcli/cmd.Date=$(date +'%Y-%m-%d')" -o ${{ matrix.artifact_name }}
shell: bash

- name: Upload artifact
Expand Down Expand Up @@ -252,7 +252,7 @@ jobs:
- name: Announce to Go proxy
run: |
VERSION="${{ needs.prepare.outputs.version }}"
MODULE_NAME="github.com/CrisisTextLine/modular/cmd/modcli"
MODULE_NAME="github.com/GoCodeAlone/modular/cmd/modcli"

GOPROXY=proxy.golang.org go list -m ${MODULE_NAME}@${VERSION}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/contract-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
actions: read

env:
GO_VERSION: '^1.25'
GO_VERSION: '^1.26'

jobs:
contract-check:
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

- name: Checkout PR branch
run: |
git checkout ${{ github.head_ref }}
git checkout ${{ github.event.pull_request.head.sha }}

- name: Extract contracts from PR branch
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copilot-setup-steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
cache-dependency-path: go.sum

# Install Go dependencies and development tools
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/examples-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
workflow_dispatch:

env:
GO_VERSION: '^1.25'
GO_VERSION: '^1.26'

jobs:
validate-examples:
Expand Down Expand Up @@ -448,10 +448,10 @@ jobs:

echo "🔍 Verifying go.mod configuration for ${{ matrix.example }}..."

# Check that replace directives point to correct paths
if ! grep -q "replace.*=> ../../" go.mod; then
# Check that replace directives point to correct local paths
if ! grep -q "replace.*=> \.\./\.\." go.mod; then
echo "❌ Missing or incorrect replace directive in ${{ matrix.example }}/go.mod"
echo "Expected: replace github.com/CrisisTextLine/modular => ../../"
echo "Expected: replace github.com/GoCodeAlone/modular => ../.."
cat go.mod
exit 1
fi
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/module-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ on:
- auth
- cache
- chimux
- configwatcher
- database
- eventbus
- eventlogger
- httpclient
- httpserver
- jsonschema
Expand Down Expand Up @@ -138,7 +140,7 @@ jobs:
if: steps.skipcheck.outputs.changed == 'true'
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
check-latest: true

- name: Build modcli
Expand Down Expand Up @@ -482,9 +484,9 @@ jobs:

# Construct correct module path with version suffix for v2+
if [ "$MAJOR_VERSION" -ge 2 ]; then
MODULE_NAME="github.com/CrisisTextLine/modular/modules/${MODULE}/v${MAJOR_VERSION}"
MODULE_NAME="github.com/GoCodeAlone/modular/modules/${MODULE}/v${MAJOR_VERSION}"
else
MODULE_NAME="github.com/CrisisTextLine/modular/modules/${MODULE}"
MODULE_NAME="github.com/GoCodeAlone/modular/modules/${MODULE}"
fi

echo "Announcing ${MODULE_NAME}@${VERSION} to Go proxy..."
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/modules-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:
workflow_dispatch:

env:
GO_VERSION: '^1.25'
GO_VERSION: '^1.26'

jobs:
# This job identifies which modules have been modified
Expand Down Expand Up @@ -137,7 +137,7 @@ jobs:
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.0 pinned
with:
token: ${{ secrets.CODECOV_TOKEN }}
slug: CrisisTextLine/modular
slug: GoCodeAlone/modular
directory: modules/${{ matrix.module }}/
files: ${{ matrix.module }}-coverage.txt
flags: ${{ matrix.module }}
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/release-all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
echo "Latest core tag: $LATEST_TAG"
HAS_CHANGES=false
if [ -z "$LATEST_TAG" ]; then
FILE=$(find . -maxdepth 1 -type f \( -name '*.go' -o -name 'go.mod' -o -name 'go.sum' \) | head -1 || true)
FILE=$(find . -maxdepth 1 -type f \( -name '*.go' -o -name 'go.mod' \) | head -1 || true)
if [ -n "$FILE" ]; then HAS_CHANGES=true; fi
else
CHANGED=$(git diff --name-only ${LATEST_TAG}..HEAD | grep -v '^modules/' || true)
Expand All @@ -53,8 +53,11 @@ jobs:
[[ $f == *.md ]] && continue
[[ $f == .github/* ]] && continue
[[ $f == examples/* ]] && continue
# Accept .go plus root go.mod/go.sum (allow optional leading ./)
if [[ $f == *.go ]] || [[ $f == go.mod ]] || [[ $f == go.sum ]] || [[ $f == ./go.mod ]] || [[ $f == ./go.sum ]]; then
[[ $f == cmd/* ]] && continue
# Accept .go plus root go.mod (NOT go.sum — it's a lockfile that
# changes whenever auto-bump runs go mod tidy and should not
# trigger a new core release by itself).
if [[ $f == *.go ]] || [[ $f == go.mod ]] || [[ $f == ./go.mod ]]; then
RELEVANT+="$f "
fi
done <<< "$CHANGED"
Expand Down Expand Up @@ -172,7 +175,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
check-latest: true
- name: Build modcli
run: |
Expand Down Expand Up @@ -275,7 +278,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
check-latest: true
- name: Build modcli
run: |
Expand Down Expand Up @@ -333,9 +336,9 @@ jobs:

# Construct correct module path with version suffix for v2+
if [ "$MAJOR_VERSION" -ge 2 ]; then
MODULE_NAME="github.com/CrisisTextLine/modular/v${MAJOR_VERSION}"
MODULE_NAME="github.com/GoCodeAlone/modular/v${MAJOR_VERSION}"
else
MODULE_NAME="github.com/CrisisTextLine/modular"
MODULE_NAME="github.com/GoCodeAlone/modular"
fi

GOPROXY=proxy.golang.org go list -m ${MODULE_NAME}@${CURR}
Expand All @@ -354,7 +357,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
check-latest: true
- name: Build modcli
run: |
Expand All @@ -377,9 +380,9 @@ jobs:
MAJOR_VERSION="${VER#v}"
MAJOR_VERSION="${MAJOR_VERSION%%.*}"
if [ "$MAJOR_VERSION" -ge 2 ]; then
MOD_PATH="github.com/CrisisTextLine/modular/modules/${M}/v${MAJOR_VERSION}"
MOD_PATH="github.com/GoCodeAlone/modular/modules/${M}/v${MAJOR_VERSION}"
else
MOD_PATH="github.com/CrisisTextLine/modular/modules/${M}"
MOD_PATH="github.com/GoCodeAlone/modular/modules/${M}"
fi

if gh release view "$TAG" >/dev/null 2>&1; then
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
if: steps.detect.outputs.core_changed == 'true'
uses: actions/setup-go@v6
with:
go-version: '^1.25'
go-version: '^1.26'
check-latest: true

- name: Build modcli
Expand Down Expand Up @@ -424,9 +424,9 @@ jobs:

# Construct correct module path with version suffix for v2+
if [ "$MAJOR_VERSION" -ge 2 ]; then
MODULE_NAME="github.com/CrisisTextLine/modular/v${MAJOR_VERSION}"
MODULE_NAME="github.com/GoCodeAlone/modular/v${MAJOR_VERSION}"
else
MODULE_NAME="github.com/CrisisTextLine/modular"
MODULE_NAME="github.com/GoCodeAlone/modular"
fi

echo "Announcing ${MODULE_NAME}@${VERSION} to Go proxy..."
Expand Down
2 changes: 1 addition & 1 deletion API_CONTRACT_MANAGEMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ modcli contract extract .
modcli contract extract ./modules/auth

# Extract from remote package
modcli contract extract github.com/CrisisTextLine/modular
modcli contract extract github.com/GoCodeAlone/modular

# Save to file with verbose output
modcli contract extract . -o contract.json -v
Expand Down
8 changes: 4 additions & 4 deletions DOCUMENTATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -968,8 +968,8 @@ import (
"fmt"
"os"

"github.com/CrisisTextLine/modular"
"github.com/CrisisTextLine/modular/modules/database"
"github.com/GoCodeAlone/modular"
"github.com/GoCodeAlone/modular/modules/database"
)

func main() {
Expand Down Expand Up @@ -1423,7 +1423,7 @@ The Modular framework provides several debugging utilities to help diagnose comm
Use `DebugModuleInterfaces` to check which interfaces a specific module implements:

```go
import "github.com/CrisisTextLine/modular"
import "github.com/GoCodeAlone/modular"

// Debug a specific module
modular.DebugModuleInterfaces(app, "your-module-name")
Expand Down Expand Up @@ -1534,7 +1534,7 @@ modular.CompareModuleInstances(originalModule, currentModule, "module-name")
For detailed analysis of why a module doesn't implement Startable:

```go
import "github.com/CrisisTextLine/modular"
import "github.com/GoCodeAlone/modular"

// Check specific module
modular.CheckModuleStartableImplementation(yourModule)
Expand Down
Loading
Loading