Compare commits
4 Commits
feat/mosai
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 98a771c8f8 | |||
| bd9527c033 | |||
| aa221bf92e | |||
| 799df40f4e |
@@ -137,6 +137,97 @@ describe('AppserviceDaemon routing', () => {
|
|||||||
expect(res.status).toBe(405);
|
expect(res.status).toBe(405);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('provisions a room as the AS sender with space linking', async () => {
|
||||||
|
const calls: Array<{ url: URL; body: unknown }> = [];
|
||||||
|
const fetchMock = vi.fn(async (input: URL | string, init?: RequestInit) => {
|
||||||
|
const url = new URL(String(input));
|
||||||
|
calls.push({ url, body: init?.body ? JSON.parse(String(init.body)) : undefined });
|
||||||
|
if (url.pathname.endsWith('/createRoom'))
|
||||||
|
return jsonResponse(200, { room_id: '!new:hs.example' });
|
||||||
|
return jsonResponse(200, {});
|
||||||
|
});
|
||||||
|
const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
|
||||||
|
const res = await daemon.handle(
|
||||||
|
request({
|
||||||
|
method: 'POST',
|
||||||
|
path: '/bridge/v1/provision/rooms',
|
||||||
|
authorizationHeader: 'Bearer bridge-secret',
|
||||||
|
body: {
|
||||||
|
name: 'proj-x',
|
||||||
|
alias: 'mosaic-proj-x',
|
||||||
|
invite: ['@jason.woltje:hs.example'],
|
||||||
|
space_id: '!space:hs.example',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect(res.body.room_id).toBe('!new:hs.example');
|
||||||
|
expect(res.body.space_linked).toBe(true);
|
||||||
|
const create = calls.find((c) => c.url.pathname.endsWith('/createRoom'));
|
||||||
|
expect(create!.url.searchParams.get('user_id')).toBe('@mosaic-as:hs.example');
|
||||||
|
const body = create!.body as Record<string, unknown>;
|
||||||
|
expect(body.room_alias_name).toBe('mosaic-proj-x');
|
||||||
|
expect((body.power_level_content_override as Record<string, unknown>).users).toEqual({
|
||||||
|
'@mosaic-as:hs.example': 100,
|
||||||
|
});
|
||||||
|
expect(calls.some((c) => c.url.pathname.includes('/state/m.space.child/'))).toBe(true);
|
||||||
|
expect(calls.some((c) => c.url.pathname.includes('/state/m.space.parent/'))).toBe(true);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('space-link failure still returns the room id (no orphan)', async () => {
|
||||||
|
const fetchMock = vi.fn(async (input: URL | string) => {
|
||||||
|
const url = new URL(String(input));
|
||||||
|
if (url.pathname.endsWith('/createRoom'))
|
||||||
|
return jsonResponse(200, { room_id: '!new:hs.example' });
|
||||||
|
if (url.pathname.includes('/state/m.space.child/'))
|
||||||
|
return jsonResponse(403, { errcode: 'M_FORBIDDEN', error: 'no PL in space' });
|
||||||
|
return jsonResponse(200, {});
|
||||||
|
});
|
||||||
|
const daemon = new AppserviceDaemon(cfg, fetchMock as unknown as typeof fetch, () => {});
|
||||||
|
const res = await daemon.handle(
|
||||||
|
request({
|
||||||
|
method: 'POST',
|
||||||
|
path: '/bridge/v1/provision/rooms',
|
||||||
|
authorizationHeader: 'Bearer bridge-secret',
|
||||||
|
body: { name: 'proj-x', space_id: '!space:hs.example' },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
expect(res.body.room_id).toBe('!new:hs.example');
|
||||||
|
expect(res.body.space_linked).toBe(false);
|
||||||
|
expect(String(res.body.space_error)).toContain('403');
|
||||||
|
});
|
||||||
|
|
||||||
|
it('invite list cap enforced', async () => {
|
||||||
|
const { daemon } = makeDaemon();
|
||||||
|
const res = await daemon.handle(
|
||||||
|
request({
|
||||||
|
method: 'POST',
|
||||||
|
path: '/bridge/v1/provision/rooms',
|
||||||
|
authorizationHeader: 'Bearer bridge-secret',
|
||||||
|
body: { name: 'x', invite: Array.from({ length: 51 }, (_, i) => `@u${i}:hs`) },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(res.status).toBe(400);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('provision rejects bad payloads and requires auth', async () => {
|
||||||
|
const { daemon } = makeDaemon();
|
||||||
|
const noAuth = await daemon.handle(
|
||||||
|
request({ method: 'POST', path: '/bridge/v1/provision/rooms', body: { name: 'x' } }),
|
||||||
|
);
|
||||||
|
expect(noAuth.status).toBe(403);
|
||||||
|
const bad = await daemon.handle(
|
||||||
|
request({
|
||||||
|
method: 'POST',
|
||||||
|
path: '/bridge/v1/provision/rooms',
|
||||||
|
authorizationHeader: 'Bearer bridge-secret',
|
||||||
|
body: { name: '', alias: 'BAD ALIAS' },
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
expect(bad.status).toBe(400);
|
||||||
|
});
|
||||||
|
|
||||||
it('empty bridge token list denies everything', async () => {
|
it('empty bridge token list denies everything', async () => {
|
||||||
const daemon = new AppserviceDaemon({ ...cfg, bridgeTokens: [] }, undefined, () => {});
|
const daemon = new AppserviceDaemon({ ...cfg, bridgeTokens: [] }, undefined, () => {});
|
||||||
const res = await daemon.handle(
|
const res = await daemon.handle(
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
TransactionHandler,
|
TransactionHandler,
|
||||||
validateBridgeMessage,
|
validateBridgeMessage,
|
||||||
validateBridgeTyping,
|
validateBridgeTyping,
|
||||||
|
validateProvisionRoom,
|
||||||
} from '@mosaicstack/appservice';
|
} from '@mosaicstack/appservice';
|
||||||
import type { AppserviceConfig, MatrixEvent } from '@mosaicstack/appservice';
|
import type { AppserviceConfig, MatrixEvent } from '@mosaicstack/appservice';
|
||||||
|
|
||||||
@@ -109,6 +110,27 @@ export class AppserviceDaemon {
|
|||||||
await this.intent.setTyping(req.body.room_id, req.body.agent, req.body.typing);
|
await this.intent.setTyping(req.body.room_id, req.body.agent, req.body.typing);
|
||||||
return { status: 200, body: {} };
|
return { status: 200, body: {} };
|
||||||
}
|
}
|
||||||
|
if (req.method === 'POST' && req.path === '/bridge/v1/provision/rooms') {
|
||||||
|
validateProvisionRoom(req.body);
|
||||||
|
const result = await this.intent.createRoom({
|
||||||
|
name: req.body.name,
|
||||||
|
alias: req.body.alias,
|
||||||
|
topic: req.body.topic,
|
||||||
|
invite: req.body.invite,
|
||||||
|
spaceId: req.body.space_id,
|
||||||
|
});
|
||||||
|
this.log(
|
||||||
|
`provisioned room ${result.roomId} (${req.body.name}) space_linked=${result.spaceLinked}`,
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
status: 200,
|
||||||
|
body: {
|
||||||
|
room_id: result.roomId,
|
||||||
|
space_linked: result.spaceLinked,
|
||||||
|
...(result.spaceError ? { space_error: result.spaceError } : {}),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
const message = error instanceof Error ? error.message : String(error);
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
this.log(`bridge error ${req.method} ${req.path}: ${message}`);
|
this.log(`bridge error ${req.method} ${req.path}: ${message}`);
|
||||||
|
|||||||
50
docs/scratchpads/536-wrapper-login-pin.md
Normal file
50
docs/scratchpads/536-wrapper-login-pin.md
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
# Issue 536 Wrapper Login Pin Scratchpad
|
||||||
|
|
||||||
|
## Metadata
|
||||||
|
|
||||||
|
- Date: 2026-06-12
|
||||||
|
- Worktree: `/home/hermes/agent-work/536-wrapper-audit`
|
||||||
|
- Branch: `fix/536-wrapper-login-pin`
|
||||||
|
- Coordinator: `mos-claude`
|
||||||
|
- Issue: `mosaicstack/stack#536`
|
||||||
|
- Scope: Audit and fix Gitea git wrappers that hardcode or incorrectly inherit tea login/instance selection.
|
||||||
|
|
||||||
|
## Objective
|
||||||
|
|
||||||
|
Fix the framework git wrappers so Gitea issue/PR operations resolve the tea login from the target repository host instead of pinning `mosaicstack`. The fix must cover the class of bug across `packages/mosaic/framework/tools/git/`, not only `issue-close.sh`.
|
||||||
|
|
||||||
|
## Acceptance Criteria
|
||||||
|
|
||||||
|
1. `issue-close.sh` no longer uses `--login mosaicstack` for non-mosaic hosts.
|
||||||
|
2. All wrappers in `packages/mosaic/framework/tools/git/` avoid hardcoded Gitea login fallback where host-specific resolution is available.
|
||||||
|
3. Host-specific resolution works for `git.mosaicstack.dev` and `git.uscllc.com` using configured credentials / tea login data.
|
||||||
|
4. Read-only verification runs against both Gitea instances where possible.
|
||||||
|
5. Queue guard passes before push, PR is opened referencing #536, and merge is left to the coordinator.
|
||||||
|
|
||||||
|
## Progress Log
|
||||||
|
|
||||||
|
- Read required Mosaic hard-gate docs and coordinator briefing.
|
||||||
|
- Read issue #536 via Gitea API with mosaicstack credentials.
|
||||||
|
- Initial audit found hardcoded `${GITEA_LOGIN:-mosaicstack}` in issue and PR wrappers, plus shared `get_gitea_repo_args`.
|
||||||
|
- Added host-aware Gitea login resolution in `detect-platform.sh`, including exact host matching for `tea login list` entries and HTTPS remotes with embedded credentials.
|
||||||
|
- Updated Gitea issue, PR, milestone, and CI wrappers to use resolved host-specific tea login arguments instead of defaulting to `mosaicstack`.
|
||||||
|
- Added authenticated API fallbacks for close/reopen paths so wrappers can still operate when a matching `tea` login is absent but token credentials are available.
|
||||||
|
- Added regression coverage for stale `GITEA_LOGIN`, exact host matching, `--repo` override flows, USC issue close routing, mosaicstack API fallback, and PR metadata/merge fallbacks.
|
||||||
|
- Delta after PR #538 review: extended host-aware login/repo resolution to PowerShell wrappers, Bash milestone wrappers, and API-only `--repo` fallback paths.
|
||||||
|
- Delta after live USC `pr-create.sh` repro: tightened `GITEA_LOGIN` trust so stale login names are ignored unless the tea login itself matches the target host, and added USC API fallback coverage for `pr-create.sh`.
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
|
||||||
|
- `bash -n packages/mosaic/framework/tools/git/*.sh`
|
||||||
|
- `packages/mosaic/framework/tools/git/test-gitea-login-resolution.sh`
|
||||||
|
- `packages/mosaic/framework/tools/git/test-pr-metadata-gitea.sh`
|
||||||
|
- `packages/mosaic/framework/tools/git/test-pr-merge-gitea-empty-uid.sh`
|
||||||
|
- `pwsh -NoProfile` parse check for all `packages/mosaic/framework/tools/git/*.ps1`
|
||||||
|
- `pnpm typecheck`
|
||||||
|
- `pnpm lint`
|
||||||
|
- `pnpm format:check`
|
||||||
|
- `pnpm --filter @mosaicstack/mosaic test -- src/commands/git-wrapper-redirects.spec.ts`
|
||||||
|
- `pnpm test` progressed past wrapper redirect assertions; local run then stopped on `apps/gateway` Postgres connection refused at `localhost:5433`, which CI provides as a service.
|
||||||
|
- Live read-only: direct Gitea API read of `mosaicstack/stack#536` with `User-Agent: curl/8`.
|
||||||
|
- Live read-only: USC temporary repo remote to `https://git.uscllc.com/USC/uconnect.git`; `issue-list.sh -n 1` resolved the USC login and returned USC issues.
|
||||||
|
- Independent Codex review final verdict: approve, no findings.
|
||||||
@@ -50,3 +50,34 @@ export function validateBridgeTyping(input: unknown): asserts input is BridgeTyp
|
|||||||
assertAgentSlug(o.agent);
|
assertAgentSlug(o.agent);
|
||||||
if (typeof o.typing !== 'boolean') throw new Error('typing must be a boolean');
|
if (typeof o.typing !== 'boolean') throw new Error('typing must be a boolean');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ProvisionRoomDto {
|
||||||
|
name: string;
|
||||||
|
alias?: string;
|
||||||
|
topic?: string;
|
||||||
|
invite?: string[];
|
||||||
|
space_id?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function validateProvisionRoom(input: unknown): asserts input is ProvisionRoomDto {
|
||||||
|
const o = input as Partial<ProvisionRoomDto> | null | undefined;
|
||||||
|
if (!o || typeof o !== 'object') throw new Error('payload must be an object');
|
||||||
|
if (typeof o.name !== 'string' || o.name.length === 0) throw new Error('name is required');
|
||||||
|
if (o.alias !== undefined && (!/^[a-z0-9_.-]+$/.test(o.alias) || o.alias.length > 200)) {
|
||||||
|
throw new Error('alias must match [a-z0-9_.-]+ (max 200 chars)');
|
||||||
|
}
|
||||||
|
if (o.invite !== undefined) {
|
||||||
|
if (
|
||||||
|
!Array.isArray(o.invite) ||
|
||||||
|
o.invite.some((u) => typeof u !== 'string' || !u.startsWith('@'))
|
||||||
|
) {
|
||||||
|
throw new Error('invite must be a list of Matrix user ids');
|
||||||
|
}
|
||||||
|
if (o.invite.length > 50) {
|
||||||
|
throw new Error('invite list exceeds maximum of 50');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (o.space_id !== undefined && (typeof o.space_id !== 'string' || !o.space_id.startsWith('!'))) {
|
||||||
|
throw new Error('space_id must be a Matrix room id');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -4,8 +4,12 @@ export { TransactionHandler } from './transactions.js';
|
|||||||
export type { TransactionHandlerOptions } from './transactions.js';
|
export type { TransactionHandlerOptions } from './transactions.js';
|
||||||
export { buildRegistration, registrationToYaml } from './registration.js';
|
export { buildRegistration, registrationToYaml } from './registration.js';
|
||||||
export type { RegistrationOptions } from './registration.js';
|
export type { RegistrationOptions } from './registration.js';
|
||||||
export { validateBridgeMessage, validateBridgeTyping } from './bridge.dto.js';
|
export {
|
||||||
export type { BridgeMessageDto, BridgeTypingDto } from './bridge.dto.js';
|
validateBridgeMessage,
|
||||||
|
validateBridgeTyping,
|
||||||
|
validateProvisionRoom,
|
||||||
|
} from './bridge.dto.js';
|
||||||
|
export type { BridgeMessageDto, BridgeTypingDto, ProvisionRoomDto } from './bridge.dto.js';
|
||||||
export type {
|
export type {
|
||||||
AppserviceConfig,
|
AppserviceConfig,
|
||||||
EventHandler,
|
EventHandler,
|
||||||
|
|||||||
@@ -172,6 +172,58 @@ export class AppserviceIntent {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Create a room as the AS sender: agents get PL 50 by namespace via the
|
||||||
|
* sender (PL 100); humans invited at default PL. Optionally link into a
|
||||||
|
* space (m.space.child + m.space.parent). Returns the room id. */
|
||||||
|
async createRoom(options: {
|
||||||
|
name: string;
|
||||||
|
alias?: string;
|
||||||
|
topic?: string;
|
||||||
|
invite?: string[];
|
||||||
|
spaceId?: string;
|
||||||
|
}): Promise<{ roomId: string; spaceLinked: boolean; spaceError?: string }> {
|
||||||
|
const body: Record<string, unknown> = {
|
||||||
|
name: options.name,
|
||||||
|
preset: 'private_chat',
|
||||||
|
invite: options.invite ?? [],
|
||||||
|
power_level_content_override: {
|
||||||
|
users: { [this.senderUserId]: 100 },
|
||||||
|
// state_default 50 stays; the AS sender can grant agents as needed.
|
||||||
|
},
|
||||||
|
};
|
||||||
|
if (options.alias) body.room_alias_name = options.alias;
|
||||||
|
if (options.topic) body.topic = options.topic;
|
||||||
|
const res = await this.request('POST', '/_matrix/client/v3/createRoom', {
|
||||||
|
userId: this.senderUserId,
|
||||||
|
body,
|
||||||
|
});
|
||||||
|
const roomId = res.room_id;
|
||||||
|
if (typeof roomId !== 'string') throw new Error('createRoom returned no room_id');
|
||||||
|
if (!options.spaceId) {
|
||||||
|
return { roomId, spaceLinked: false };
|
||||||
|
}
|
||||||
|
// Space-link failures must NOT throw: the room already exists, and an
|
||||||
|
// exception would hide the room_id (orphaned room, no recovery path).
|
||||||
|
const encodedSpaceId = encodeURIComponent(options.spaceId);
|
||||||
|
const encodedRoomId = encodeURIComponent(roomId);
|
||||||
|
try {
|
||||||
|
await this.request(
|
||||||
|
'PUT',
|
||||||
|
`/_matrix/client/v3/rooms/${encodedSpaceId}/state/m.space.child/${encodedRoomId}`,
|
||||||
|
{ userId: this.senderUserId, body: { via: [this.cfg.domain], suggested: true } },
|
||||||
|
);
|
||||||
|
await this.request(
|
||||||
|
'PUT',
|
||||||
|
`/_matrix/client/v3/rooms/${encodedRoomId}/state/m.space.parent/${encodedSpaceId}`,
|
||||||
|
{ userId: this.senderUserId, body: { via: [this.cfg.domain], canonical: true } },
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
const message = error instanceof Error ? error.message : String(error);
|
||||||
|
return { roomId, spaceLinked: false, spaceError: message };
|
||||||
|
}
|
||||||
|
return { roomId, spaceLinked: true };
|
||||||
|
}
|
||||||
|
|
||||||
/** Set display name for an agent's virtual user. */
|
/** Set display name for an agent's virtual user. */
|
||||||
async setDisplayName(agent: string, displayName: string): Promise<void> {
|
async setDisplayName(agent: string, displayName: string): Promise<void> {
|
||||||
const userId = await this.ensureRegistered(agent);
|
const userId = await this.ensureRegistered(agent);
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ At session start, additionally:
|
|||||||
10. Manual `docker build` / `docker push` for deployment is FORBIDDEN when CI/CD pipelines exist in the repository. CI is the ONLY canonical build path for container images.
|
10. Manual `docker build` / `docker push` for deployment is FORBIDDEN when CI/CD pipelines exist in the repository. CI is the ONLY canonical build path for container images.
|
||||||
11. Before ANY build or deployment action, you MUST check for existing CI/CD pipeline configuration (`.woodpecker/`, `.woodpecker.yml`, `.github/workflows/`, etc.). If pipelines exist, use them — do not build locally.
|
11. Before ANY build or deployment action, you MUST check for existing CI/CD pipeline configuration (`.woodpecker/`, `.woodpecker.yml`, `.github/workflows/`, etc.). If pipelines exist, use them — do not build locally.
|
||||||
12. The mandatory intake procedure is NOT conditional on perceived task complexity. A "simple" commit-push-deploy task has the same procedural requirements as a multi-file feature. Skipping intake because a task "seems simple" is the most common framework violation.
|
12. The mandatory intake procedure is NOT conditional on perceived task complexity. A "simple" commit-push-deploy task has the same procedural requirements as a multi-file feature. Skipping intake because a task "seems simple" is the most common framework violation.
|
||||||
|
13. **Merge authority (coordinated work):** when a coordinator/orchestrator session is active for the work, the post-review MERGE GO-AHEAD is the coordinator's to give — once code has passed the required review gates, request the coordinator's go-ahead and merge on their confirmation; do NOT wait on the human owner personally. Solo (uncoordinated) delivery keeps the default: merge without routine confirmation per gates 2 and 9. A "No self-merge" note on a PR means no UNREVIEWED self-merge — it does not suspend coordinator-authorized merges. (Policy: Jason, 2026-06-11.)
|
||||||
|
|
||||||
## Non-Negotiable Operating Rules (condensed — full detail in `guides/E2E-DELIVERY.md`)
|
## Non-Negotiable Operating Rules (condensed — full detail in `guides/E2E-DELIVERY.md`)
|
||||||
|
|
||||||
|
|||||||
@@ -88,6 +88,11 @@ For implementation work, you MUST run this cycle in order:
|
|||||||
|
|
||||||
### Post-PR Hard Gate (Execute Sequentially, No Exceptions)
|
### Post-PR Hard Gate (Execute Sequentially, No Exceptions)
|
||||||
|
|
||||||
|
> **Merge authority:** if a coordinator/orchestrator session is active for this
|
||||||
|
> work, obtain the coordinator's merge go-ahead after review passes, then run
|
||||||
|
> the gate (AGENTS.md hard gate "Merge authority"). Solo delivery proceeds
|
||||||
|
> without asking.
|
||||||
|
|
||||||
1. `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`
|
1. `~/.config/mosaic/tools/git/ci-queue-wait.sh --purpose merge -B main`
|
||||||
2. `~/.config/mosaic/tools/git/pr-merge.sh -n <PR_NUMBER> -m squash`
|
2. `~/.config/mosaic/tools/git/pr-merge.sh -n <PR_NUMBER> -m squash`
|
||||||
3. `~/.config/mosaic/tools/git/pr-ci-wait.sh -n <PR_NUMBER>`
|
3. `~/.config/mosaic/tools/git/pr-ci-wait.sh -n <PR_NUMBER>`
|
||||||
|
|||||||
@@ -137,7 +137,7 @@ gitea_get_branch_head_sha() {
|
|||||||
local branch="$3"
|
local branch="$3"
|
||||||
local token="$4"
|
local token="$4"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/branches/${branch}"
|
local url="https://${host}/api/v1/repos/${repo}/branches/${branch}"
|
||||||
curl -fsSL -H "Authorization: token ${token}" "$url" | python3 -c '
|
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url" | python3 -c '
|
||||||
import json, sys
|
import json, sys
|
||||||
data = json.load(sys.stdin)
|
data = json.load(sys.stdin)
|
||||||
commit = data.get("commit") or {}
|
commit = data.get("commit") or {}
|
||||||
@@ -151,7 +151,7 @@ gitea_get_commit_status_json() {
|
|||||||
local sha="$3"
|
local sha="$3"
|
||||||
local token="$4"
|
local token="$4"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
||||||
curl -fsSL -H "Authorization: token ${token}" "$url"
|
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url"
|
||||||
}
|
}
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
|
|||||||
@@ -55,6 +55,154 @@ function Get-GitRepoInfo {
|
|||||||
return $repoPath
|
return $repoPath
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function Get-GitRemoteHost {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param()
|
||||||
|
|
||||||
|
$remoteUrl = git remote get-url origin 2>$null
|
||||||
|
|
||||||
|
if ([string]::IsNullOrEmpty($remoteUrl)) {
|
||||||
|
Write-Error "Not a git repository or no origin remote"
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($remoteUrl -match "^https?://([^/]+)/") {
|
||||||
|
$remoteHost = $Matches[1]
|
||||||
|
return ($remoteHost -replace "^.*@", "")
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($remoteUrl -match "^git@([^:]+):") {
|
||||||
|
return $Matches[1]
|
||||||
|
}
|
||||||
|
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-TeaLoginList {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param()
|
||||||
|
|
||||||
|
$json = tea login list --output json 2>$null
|
||||||
|
if (-not $json) {
|
||||||
|
return @()
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$items = $json | ConvertFrom-Json
|
||||||
|
} catch {
|
||||||
|
return @()
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($null -eq $items) {
|
||||||
|
return @()
|
||||||
|
}
|
||||||
|
|
||||||
|
return @($items)
|
||||||
|
}
|
||||||
|
|
||||||
|
function Test-GiteaUrlMatchesHost {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[string]$Url,
|
||||||
|
[string]$GiteaHost
|
||||||
|
)
|
||||||
|
|
||||||
|
if ([string]::IsNullOrEmpty($Url) -or [string]::IsNullOrEmpty($GiteaHost)) {
|
||||||
|
return $false
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$uri = [Uri]$Url
|
||||||
|
return $uri.Host -eq $GiteaHost
|
||||||
|
} catch {
|
||||||
|
return $false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function Find-TeaLoginForHost {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param([Parameter(Mandatory=$true)][string]$GiteaHost)
|
||||||
|
|
||||||
|
foreach ($login in Get-TeaLoginList) {
|
||||||
|
$name = if ($login.name) { [string]$login.name } elseif ($login.Name) { [string]$login.Name } else { "" }
|
||||||
|
$url = if ($login.url) { [string]$login.url } elseif ($login.URL) { [string]$login.URL } else { "" }
|
||||||
|
if ([string]::IsNullOrEmpty($name) -or [string]::IsNullOrEmpty($url)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$uri = [Uri]$url
|
||||||
|
if ($uri.Host -eq $GiteaHost) {
|
||||||
|
return $name
|
||||||
|
}
|
||||||
|
} catch {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
function Test-TeaLoginMatchesHost {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param(
|
||||||
|
[Parameter(Mandatory=$true)][string]$LoginName,
|
||||||
|
[Parameter(Mandatory=$true)][string]$GiteaHost
|
||||||
|
)
|
||||||
|
|
||||||
|
foreach ($login in Get-TeaLoginList) {
|
||||||
|
$name = if ($login.name) { [string]$login.name } elseif ($login.Name) { [string]$login.Name } else { "" }
|
||||||
|
$url = if ($login.url) { [string]$login.url } elseif ($login.URL) { [string]$login.URL } else { "" }
|
||||||
|
if ($name -ne $LoginName -or [string]::IsNullOrEmpty($url)) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
$uri = [Uri]$url
|
||||||
|
return $uri.Host -eq $GiteaHost
|
||||||
|
} catch {
|
||||||
|
return $false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $false
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-GiteaLoginForHost {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param([string]$GiteaHost)
|
||||||
|
|
||||||
|
if ([string]::IsNullOrEmpty($GiteaHost)) {
|
||||||
|
$GiteaHost = Get-GitRemoteHost
|
||||||
|
}
|
||||||
|
if ([string]::IsNullOrEmpty($GiteaHost)) {
|
||||||
|
return $null
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($env:GITEA_LOGIN) {
|
||||||
|
if (Test-TeaLoginMatchesHost -LoginName $env:GITEA_LOGIN -GiteaHost $GiteaHost) {
|
||||||
|
return $env:GITEA_LOGIN
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return Find-TeaLoginForHost -GiteaHost $GiteaHost
|
||||||
|
}
|
||||||
|
|
||||||
|
function Get-GiteaRepoArgs {
|
||||||
|
[CmdletBinding()]
|
||||||
|
param()
|
||||||
|
|
||||||
|
$repo = Get-GitRepoInfo
|
||||||
|
$hostName = Get-GitRemoteHost
|
||||||
|
$login = Get-GiteaLoginForHost -GiteaHost $hostName
|
||||||
|
|
||||||
|
if ([string]::IsNullOrEmpty($repo) -or [string]::IsNullOrEmpty($login)) {
|
||||||
|
return @()
|
||||||
|
}
|
||||||
|
|
||||||
|
return @("--repo", $repo, "--login", $login)
|
||||||
|
}
|
||||||
|
|
||||||
function Get-GitRepoOwner {
|
function Get-GitRepoOwner {
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param()
|
param()
|
||||||
|
|||||||
@@ -78,10 +78,211 @@ get_repo_slug() {
|
|||||||
get_repo_info
|
get_repo_info
|
||||||
}
|
}
|
||||||
|
|
||||||
|
gitea_url_matches_host() {
|
||||||
|
local url="${1:-}" host="${2:-}"
|
||||||
|
[[ -n "$url" && -n "$host" ]] || return 1
|
||||||
|
[[ "${url%/}" == "https://$host" || "${url%/}" == "http://$host" || "${url%/}" == *"//$host" ]]
|
||||||
|
}
|
||||||
|
|
||||||
|
get_gitea_service_for_host() {
|
||||||
|
local host="$1"
|
||||||
|
local cred_file="${MOSAIC_CREDENTIALS_FILE:-$HOME/src/jarvis-brain/credentials.json}"
|
||||||
|
|
||||||
|
case "$host" in
|
||||||
|
git.mosaicstack.dev)
|
||||||
|
echo "mosaicstack"
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
git.uscllc.com)
|
||||||
|
echo "usc"
|
||||||
|
return 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
[[ -f "$cred_file" ]] || return 1
|
||||||
|
command -v jq >/dev/null 2>&1 || return 1
|
||||||
|
|
||||||
|
jq -r --arg host "$host" '
|
||||||
|
.gitea // {}
|
||||||
|
| to_entries[]
|
||||||
|
| select((.value.url // "" | sub("/+$"; "")) | test("https?://" + $host + "$"))
|
||||||
|
| .key
|
||||||
|
' "$cred_file" | head -n 1
|
||||||
|
}
|
||||||
|
|
||||||
|
find_tea_login_for_host() {
|
||||||
|
local host="$1"
|
||||||
|
local logins_json
|
||||||
|
|
||||||
|
command -v tea >/dev/null 2>&1 || return 1
|
||||||
|
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
||||||
|
TEA_LOGINS_JSON="$logins_json" python3 - "$host" <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
host = sys.argv[1]
|
||||||
|
try:
|
||||||
|
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
||||||
|
except Exception:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
for login in logins if isinstance(logins, list) else []:
|
||||||
|
url = str(login.get("url") or login.get("URL") or "")
|
||||||
|
name = str(login.get("name") or login.get("Name") or "")
|
||||||
|
parsed = urlparse(url)
|
||||||
|
if parsed.hostname == host and name:
|
||||||
|
print(name)
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
raise SystemExit(1)
|
||||||
|
PY
|
||||||
|
}
|
||||||
|
|
||||||
|
tea_login_matches_host() {
|
||||||
|
local login_name="$1" host="$2"
|
||||||
|
local logins_json
|
||||||
|
|
||||||
|
command -v tea >/dev/null 2>&1 || return 1
|
||||||
|
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
||||||
|
TEA_LOGINS_JSON="$logins_json" python3 - "$login_name" "$host" <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
login_name, host = sys.argv[1], sys.argv[2]
|
||||||
|
try:
|
||||||
|
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
||||||
|
except Exception:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
for login in logins if isinstance(logins, list) else []:
|
||||||
|
url = str(login.get("url") or login.get("URL") or "")
|
||||||
|
name = str(login.get("name") or login.get("Name") or "")
|
||||||
|
parsed = urlparse(url)
|
||||||
|
if name == login_name and parsed.hostname == host:
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
raise SystemExit(1)
|
||||||
|
PY
|
||||||
|
}
|
||||||
|
|
||||||
|
get_gitea_login_for_host() {
|
||||||
|
local host="${1:-}"
|
||||||
|
local login
|
||||||
|
|
||||||
|
if [[ -z "$host" ]]; then
|
||||||
|
host=$(get_remote_host) || return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n "${GITEA_LOGIN:-}" ]]; then
|
||||||
|
if tea_login_matches_host "$GITEA_LOGIN" "$host"; then
|
||||||
|
echo "$GITEA_LOGIN"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
login=$(find_tea_login_for_host "$host" || true)
|
||||||
|
if [[ -n "$login" ]]; then
|
||||||
|
echo "$login"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
get_default_tea_login() {
|
||||||
|
local logins_json
|
||||||
|
|
||||||
|
command -v tea >/dev/null 2>&1 || return 1
|
||||||
|
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
||||||
|
TEA_LOGINS_JSON="$logins_json" python3 - <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
try:
|
||||||
|
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
||||||
|
except Exception:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
if not isinstance(logins, list) or not logins:
|
||||||
|
raise SystemExit(1)
|
||||||
|
|
||||||
|
for login in logins:
|
||||||
|
if not isinstance(login, dict):
|
||||||
|
continue
|
||||||
|
is_default = str(login.get("default") or login.get("Default") or "").lower()
|
||||||
|
name = str(login.get("name") or login.get("Name") or "")
|
||||||
|
if name and is_default == "true":
|
||||||
|
print(name)
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
for login in logins:
|
||||||
|
if not isinstance(login, dict):
|
||||||
|
continue
|
||||||
|
name = str(login.get("name") or login.get("Name") or "")
|
||||||
|
if name:
|
||||||
|
print(name)
|
||||||
|
raise SystemExit(0)
|
||||||
|
|
||||||
|
raise SystemExit(1)
|
||||||
|
PY
|
||||||
|
}
|
||||||
|
|
||||||
|
get_gitea_login_for_repo_override() {
|
||||||
|
local login
|
||||||
|
|
||||||
|
if [[ -n "${GITEA_LOGIN:-}" ]]; then
|
||||||
|
echo "$GITEA_LOGIN"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
login=$(get_default_tea_login || true)
|
||||||
|
if [[ -n "$login" ]]; then
|
||||||
|
echo "$login"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
|
||||||
|
get_host_from_url() {
|
||||||
|
local url="${1:-}"
|
||||||
|
[[ -n "$url" ]] || return 1
|
||||||
|
|
||||||
|
python3 - "$url" <<'PY'
|
||||||
|
import sys
|
||||||
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
|
parsed = urlparse(sys.argv[1])
|
||||||
|
if parsed.hostname:
|
||||||
|
print(parsed.hostname)
|
||||||
|
raise SystemExit(0)
|
||||||
|
raise SystemExit(1)
|
||||||
|
PY
|
||||||
|
}
|
||||||
|
|
||||||
|
get_gitea_api_host_for_repo_override() {
|
||||||
|
if [[ -n "${GITEA_HOST:-}" ]]; then
|
||||||
|
echo "$GITEA_HOST"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
get_host_from_url "${GITEA_URL:-}"
|
||||||
|
}
|
||||||
|
|
||||||
get_gitea_repo_args() {
|
get_gitea_repo_args() {
|
||||||
local repo
|
local repo host login
|
||||||
repo=$(get_repo_slug) || return 1
|
repo=$(get_repo_slug) || return 1
|
||||||
printf -- '--repo %q --login %q' "$repo" "${GITEA_LOGIN:-mosaicstack}"
|
host=$(get_remote_host) || return 1
|
||||||
|
login=$(get_gitea_login_for_host "$host") || return 1
|
||||||
|
printf -- '--repo %q --login %q' "$repo" "$login"
|
||||||
|
}
|
||||||
|
|
||||||
|
get_gitea_login() {
|
||||||
|
get_gitea_login_for_host "$(get_remote_host)"
|
||||||
}
|
}
|
||||||
|
|
||||||
get_remote_host() {
|
get_remote_host() {
|
||||||
@@ -91,7 +292,8 @@ get_remote_host() {
|
|||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [[ "$remote_url" =~ ^https?://([^/]+)/ ]]; then
|
if [[ "$remote_url" =~ ^https?://([^/]+)/ ]]; then
|
||||||
echo "${BASH_REMATCH[1]}"
|
local host="${BASH_REMATCH[1]}"
|
||||||
|
echo "${host##*@}"
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
if [[ "$remote_url" =~ ^git@([^:]+): ]]; then
|
if [[ "$remote_url" =~ ^git@([^:]+): ]]; then
|
||||||
|
|||||||
@@ -75,6 +75,11 @@ switch ($platform) {
|
|||||||
Write-Host "Issue #$Issue updated successfully"
|
Write-Host "Issue #$Issue updated successfully"
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
$needsEdit = $false
|
$needsEdit = $false
|
||||||
$cmd = @("tea", "issue", "edit", $Issue)
|
$cmd = @("tea", "issue", "edit", $Issue)
|
||||||
|
|
||||||
@@ -87,7 +92,7 @@ switch ($platform) {
|
|||||||
$needsEdit = $true
|
$needsEdit = $true
|
||||||
}
|
}
|
||||||
if ($Milestone) {
|
if ($Milestone) {
|
||||||
$milestoneList = tea milestones list 2>$null
|
$milestoneList = tea milestones list @repoArgs 2>$null
|
||||||
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
||||||
if ($milestoneId) {
|
if ($milestoneId) {
|
||||||
$cmd += @("--milestone", $milestoneId)
|
$cmd += @("--milestone", $milestoneId)
|
||||||
@@ -98,6 +103,7 @@ switch ($platform) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($needsEdit) {
|
if ($needsEdit) {
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
Write-Host "Issue #$Issue updated successfully"
|
Write-Host "Issue #$Issue updated successfully"
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -98,7 +98,11 @@ case "$PLATFORM" in
|
|||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
# tea issue edit syntax
|
# tea issue edit syntax
|
||||||
CMD="tea issue edit $ISSUE"
|
REPO_ARGS=$(get_gitea_repo_args) || {
|
||||||
|
echo "Error: Could not resolve Gitea repo/login args for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
CMD="tea issue edit $ISSUE $REPO_ARGS"
|
||||||
NEEDS_EDIT=false
|
NEEDS_EDIT=false
|
||||||
|
|
||||||
if [[ -n "$ASSIGNEE" ]]; then
|
if [[ -n "$ASSIGNEE" ]]; then
|
||||||
@@ -112,7 +116,7 @@ case "$PLATFORM" in
|
|||||||
NEEDS_EDIT=true
|
NEEDS_EDIT=true
|
||||||
fi
|
fi
|
||||||
if [[ -n "$MILESTONE" ]]; then
|
if [[ -n "$MILESTONE" ]]; then
|
||||||
MILESTONE_ID=$(tea milestones list 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
|
MILESTONE_ID=$(tea milestones list $REPO_ARGS 2>/dev/null | grep -E "^\s*[0-9]+" | grep "$MILESTONE" | awk '{print $1}' | head -1)
|
||||||
if [[ -n "$MILESTONE_ID" ]]; then
|
if [[ -n "$MILESTONE_ID" ]]; then
|
||||||
CMD="$CMD --milestone $MILESTONE_ID"
|
CMD="$CMD --milestone $MILESTONE_ID"
|
||||||
NEEDS_EDIT=true
|
NEEDS_EDIT=true
|
||||||
|
|||||||
@@ -44,10 +44,43 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Detect platform and close issue
|
# Detect platform and close issue
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
OWNER=$(get_repo_owner)
|
OWNER=$(get_repo_owner)
|
||||||
REPO=$(get_repo_name)
|
REPO=$(get_repo_name)
|
||||||
|
|
||||||
|
gitea_issue_comment_api() {
|
||||||
|
local host token url payload
|
||||||
|
host=$(get_remote_host) || return 1
|
||||||
|
token=$(get_gitea_token "$host") || return 1
|
||||||
|
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}/comments"
|
||||||
|
payload=$(COMMENT="$COMMENT" python3 - <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
print(json.dumps({"body": os.environ["COMMENT"]}))
|
||||||
|
PY
|
||||||
|
)
|
||||||
|
curl -fsS -X POST \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
|
-H "Authorization: token ${token}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$payload" \
|
||||||
|
"$url" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
gitea_issue_close_api() {
|
||||||
|
local host token url
|
||||||
|
host=$(get_remote_host) || return 1
|
||||||
|
token=$(get_gitea_token "$host") || return 1
|
||||||
|
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}"
|
||||||
|
curl -fsS -X PATCH \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
|
-H "Authorization: token ${token}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"state":"closed"}' \
|
||||||
|
"$url" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
||||||
@@ -55,10 +88,19 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
gh issue close "$ISSUE_NUMBER"
|
gh issue close "$ISSUE_NUMBER"
|
||||||
echo "Closed GitHub issue #$ISSUE_NUMBER"
|
echo "Closed GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login || true)
|
||||||
|
if [[ -n "$GITEA_LOGIN_NAME" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
tea issue comment "$ISSUE_NUMBER" "$COMMENT" --repo "$OWNER/$REPO" --login "${GITEA_LOGIN:-mosaicstack}"
|
tea issue comment "$ISSUE_NUMBER" "$COMMENT" --repo "$OWNER/$REPO" --login "$GITEA_LOGIN_NAME"
|
||||||
|
fi
|
||||||
|
tea issue close "$ISSUE_NUMBER" --repo "$OWNER/$REPO" --login "$GITEA_LOGIN_NAME"
|
||||||
|
else
|
||||||
|
echo "No tea login configured for $(get_remote_host); using authenticated Gitea API fallback." >&2
|
||||||
|
if [[ -n "$COMMENT" ]]; then
|
||||||
|
gitea_issue_comment_api
|
||||||
|
fi
|
||||||
|
gitea_issue_close_api
|
||||||
fi
|
fi
|
||||||
tea issue close "$ISSUE_NUMBER" --repo "$OWNER/$REPO" --login "${GITEA_LOGIN:-mosaicstack}"
|
|
||||||
echo "Closed Gitea issue #$ISSUE_NUMBER"
|
echo "Closed Gitea issue #$ISSUE_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ if [[ -z "$COMMENT" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
gh issue comment "$ISSUE_NUMBER" --body "$COMMENT"
|
||||||
|
|||||||
@@ -58,12 +58,17 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
$cmd = @("tea", "issue", "create", "--title", $Title)
|
$cmd = @("tea", "issue", "create", "--title", $Title)
|
||||||
if ($Body) { $cmd += @("--description", $Body) }
|
if ($Body) { $cmd += @("--description", $Body) }
|
||||||
if ($Labels) { $cmd += @("--labels", $Labels) }
|
if ($Labels) { $cmd += @("--labels", $Labels) }
|
||||||
if ($Milestone) {
|
if ($Milestone) {
|
||||||
# Try to get milestone ID by name
|
# Try to get milestone ID by name
|
||||||
$milestoneList = tea milestones list 2>$null
|
$milestoneList = tea milestones list @repoArgs 2>$null
|
||||||
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
||||||
if ($milestoneId) {
|
if ($milestoneId) {
|
||||||
$cmd += @("--milestone", $milestoneId)
|
$cmd += @("--milestone", $milestoneId)
|
||||||
@@ -71,6 +76,7 @@ switch ($platform) {
|
|||||||
Write-Warning "Could not find milestone '$Milestone', creating without milestone"
|
Write-Warning "Could not find milestone '$Milestone', creating without milestone"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -48,6 +48,7 @@ PY
|
|||||||
|
|
||||||
url="https://${host}/api/v1/repos/${repo}/issues"
|
url="https://${host}/api/v1/repos/${repo}/issues"
|
||||||
curl -fsS -X POST \
|
curl -fsS -X POST \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
-H "Authorization: token ${token}" \
|
-H "Authorization: token ${token}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
@@ -121,7 +122,12 @@ case "$PLATFORM" in
|
|||||||
gitea)
|
gitea)
|
||||||
if command -v tea >/dev/null 2>&1; then
|
if command -v tea >/dev/null 2>&1; then
|
||||||
REPO_SLUG=$(get_repo_slug)
|
REPO_SLUG=$(get_repo_slug)
|
||||||
REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
|
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
||||||
|
echo "Warning: could not resolve Gitea login for tea; trying Gitea API fallback..." >&2
|
||||||
|
gitea_issue_create_api
|
||||||
|
exit $?
|
||||||
|
}
|
||||||
|
REPO_ARGS=(--repo "$REPO_SLUG" --login "$GITEA_LOGIN_NAME")
|
||||||
CMD=(tea issue create "${REPO_ARGS[@]}" --title "$TITLE")
|
CMD=(tea issue create "${REPO_ARGS[@]}" --title "$TITLE")
|
||||||
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
||||||
[[ -n "$LABELS" ]] && CMD+=(--labels "$LABELS")
|
[[ -n "$LABELS" ]] && CMD+=(--labels "$LABELS")
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
CMD="gh issue edit $ISSUE_NUMBER"
|
CMD="gh issue edit $ISSUE_NUMBER"
|
||||||
@@ -71,7 +71,11 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
eval $CMD
|
eval $CMD
|
||||||
echo "Updated GitHub issue #$ISSUE_NUMBER"
|
echo "Updated GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
CMD="tea issue edit $ISSUE_NUMBER"
|
REPO_ARGS=$(get_gitea_repo_args) || {
|
||||||
|
echo "Error: Could not resolve Gitea repo/login args for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
CMD="tea issue edit $ISSUE_NUMBER $REPO_ARGS"
|
||||||
[[ -n "$TITLE" ]] && CMD="$CMD --title \"$TITLE\""
|
[[ -n "$TITLE" ]] && CMD="$CMD --title \"$TITLE\""
|
||||||
[[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
|
[[ -n "$BODY" ]] && CMD="$CMD --description \"$BODY\""
|
||||||
[[ -n "$LABELS" ]] && CMD="$CMD --add-labels \"$LABELS\""
|
[[ -n "$LABELS" ]] && CMD="$CMD --add-labels \"$LABELS\""
|
||||||
|
|||||||
@@ -63,9 +63,15 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
$cmd = @("tea", "issues", "list", "--state", $State, "--limit", $Limit)
|
$cmd = @("tea", "issues", "list", "--state", $State, "--limit", $Limit)
|
||||||
if ($Label) { $cmd += @("--labels", $Label) }
|
if ($Label) { $cmd += @("--labels", $Label) }
|
||||||
if ($Milestone) { $cmd += @("--milestones", $Milestone) }
|
if ($Milestone) { $cmd += @("--milestones", $Milestone) }
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
if ($Assignee) {
|
if ($Assignee) {
|
||||||
Write-Warning "Assignee filtering may require manual review for Gitea"
|
Write-Warning "Assignee filtering may require manual review for Gitea"
|
||||||
|
|||||||
@@ -98,7 +98,18 @@ case "$PLATFORM" in
|
|||||||
"${CMD[@]}"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
CMD=(tea issues list --repo "$REPO_INFO" --login "${GITEA_LOGIN:-mosaicstack}" --state "$STATE" --limit "$LIMIT")
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login_for_repo_override) || {
|
||||||
|
echo "Error: Could not resolve Gitea login for --repo override. Set GITEA_LOGIN or configure a default tea login." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
||||||
|
echo "Error: Could not resolve Gitea login for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
CMD=(tea issues list --repo "$REPO_INFO" --login "$GITEA_LOGIN_NAME" --state "$STATE" --limit "$LIMIT")
|
||||||
[[ -n "$LABEL" ]] && CMD+=(--labels "$LABEL")
|
[[ -n "$LABEL" ]] && CMD+=(--labels "$LABEL")
|
||||||
[[ -n "$MILESTONE" ]] && CMD+=(--milestones "$MILESTONE")
|
[[ -n "$MILESTONE" ]] && CMD+=(--milestones "$MILESTONE")
|
||||||
# Note: tea may not support assignee filter directly in all versions.
|
# Note: tea may not support assignee filter directly in all versions.
|
||||||
|
|||||||
@@ -42,7 +42,42 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
OWNER=$(get_repo_owner)
|
||||||
|
REPO=$(get_repo_name)
|
||||||
|
|
||||||
|
gitea_issue_comment_api() {
|
||||||
|
local host token url payload
|
||||||
|
host=$(get_remote_host) || return 1
|
||||||
|
token=$(get_gitea_token "$host") || return 1
|
||||||
|
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}/comments"
|
||||||
|
payload=$(COMMENT="$COMMENT" python3 - <<'PY'
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
print(json.dumps({"body": os.environ["COMMENT"]}))
|
||||||
|
PY
|
||||||
|
)
|
||||||
|
curl -fsS -X POST \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
|
-H "Authorization: token ${token}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d "$payload" \
|
||||||
|
"$url" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
gitea_issue_reopen_api() {
|
||||||
|
local host token url
|
||||||
|
host=$(get_remote_host) || return 1
|
||||||
|
token=$(get_gitea_token "$host") || return 1
|
||||||
|
url="https://${host}/api/v1/repos/${OWNER}/${REPO}/issues/${ISSUE_NUMBER}"
|
||||||
|
curl -fsS -X PATCH \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
|
-H "Authorization: token ${token}" \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-d '{"state":"open"}' \
|
||||||
|
"$url" >/dev/null
|
||||||
|
}
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
@@ -51,10 +86,19 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
gh issue reopen "$ISSUE_NUMBER"
|
gh issue reopen "$ISSUE_NUMBER"
|
||||||
echo "Reopened GitHub issue #$ISSUE_NUMBER"
|
echo "Reopened GitHub issue #$ISSUE_NUMBER"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
|
REPO_ARGS=$(get_gitea_repo_args || true)
|
||||||
|
if [[ -n "$REPO_ARGS" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
tea issue comment "$ISSUE_NUMBER" "$COMMENT" $(get_gitea_repo_args)
|
tea issue comment "$ISSUE_NUMBER" "$COMMENT" $REPO_ARGS
|
||||||
|
fi
|
||||||
|
tea issue reopen "$ISSUE_NUMBER" $REPO_ARGS
|
||||||
|
else
|
||||||
|
echo "No tea login configured for $(get_remote_host); using authenticated Gitea API fallback." >&2
|
||||||
|
if [[ -n "$COMMENT" ]]; then
|
||||||
|
gitea_issue_comment_api
|
||||||
|
fi
|
||||||
|
gitea_issue_reopen_api
|
||||||
fi
|
fi
|
||||||
tea issue reopen "$ISSUE_NUMBER" $(get_gitea_repo_args)
|
|
||||||
echo "Reopened Gitea issue #$ISSUE_NUMBER"
|
echo "Reopened Gitea issue #$ISSUE_NUMBER"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -29,9 +29,9 @@ gitea_issue_view_api() {
|
|||||||
|
|
||||||
url="https://${host}/api/v1/repos/${repo}/issues/${ISSUE_NUMBER}"
|
url="https://${host}/api/v1/repos/${repo}/issues/${ISSUE_NUMBER}"
|
||||||
if command -v python3 >/dev/null 2>&1; then
|
if command -v python3 >/dev/null 2>&1; then
|
||||||
curl -fsS -H "Authorization: token ${token}" "$url" | python3 -m json.tool
|
curl -fsS -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url" | python3 -m json.tool
|
||||||
else
|
else
|
||||||
curl -fsS -H "Authorization: token ${token}" "$url"
|
curl -fsS -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +61,7 @@ if [[ -z "$ISSUE_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh issue view "$ISSUE_NUMBER"
|
gh issue view "$ISSUE_NUMBER"
|
||||||
|
|||||||
@@ -36,13 +36,17 @@ if [[ -z "$TITLE" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh api -X PATCH "/repos/{owner}/{repo}/milestones/$(gh api "/repos/{owner}/{repo}/milestones" --jq ".[] | select(.title==\"$TITLE\") | .number")" -f state=closed
|
gh api -X PATCH "/repos/{owner}/{repo}/milestones/$(gh api "/repos/{owner}/{repo}/milestones" --jq ".[] | select(.title==\"$TITLE\") | .number")" -f state=closed
|
||||||
echo "Closed GitHub milestone: $TITLE"
|
echo "Closed GitHub milestone: $TITLE"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
tea milestone close "$TITLE"
|
REPO_ARGS=$(get_gitea_repo_args) || {
|
||||||
|
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
tea milestone close "$TITLE" $REPO_ARGS
|
||||||
echo "Closed Gitea milestone: $TITLE"
|
echo "Closed Gitea milestone: $TITLE"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
|
|||||||
@@ -59,7 +59,12 @@ if ($List) {
|
|||||||
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)`t\(.title)`t\(.state)`t\(.open_issues)/\(.closed_issues) issues"'
|
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)`t\(.title)`t\(.state)`t\(.open_issues)/\(.closed_issues) issues"'
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
tea milestones list
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
tea milestones list @repoArgs
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
Write-Error "Could not detect git platform"
|
Write-Error "Could not detect git platform"
|
||||||
@@ -85,9 +90,15 @@ switch ($platform) {
|
|||||||
Write-Host "Milestone '$Title' created successfully"
|
Write-Host "Milestone '$Title' created successfully"
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
$cmd = @("tea", "milestones", "create", "--title", $Title)
|
$cmd = @("tea", "milestones", "create", "--title", $Title)
|
||||||
if ($Description) { $cmd += @("--description", $Description) }
|
if ($Description) { $cmd += @("--description", $Description) }
|
||||||
if ($Due) { $cmd += @("--deadline", $Due) }
|
if ($Due) { $cmd += @("--deadline", $Due) }
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
Write-Host "Milestone '$Title' created successfully"
|
Write-Host "Milestone '$Title' created successfully"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,11 @@ if [[ "$LIST_ONLY" == true ]]; then
|
|||||||
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)\t\(.title)\t\(.state)\t\(.open_issues)/\(.closed_issues) issues"'
|
gh api repos/:owner/:repo/milestones --jq '.[] | "\(.number)\t\(.title)\t\(.state)\t\(.open_issues)/\(.closed_issues) issues"'
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
tea milestones list
|
REPO_ARGS=$(get_gitea_repo_args) || {
|
||||||
|
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
tea milestones list $REPO_ARGS
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Error: Could not detect git platform" >&2
|
echo "Error: Could not detect git platform" >&2
|
||||||
@@ -104,10 +108,14 @@ case "$PLATFORM" in
|
|||||||
echo "Milestone '$TITLE' created successfully"
|
echo "Milestone '$TITLE' created successfully"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
CMD="tea milestones create --title \"$TITLE\""
|
REPO_ARGS=$(get_gitea_repo_args) || {
|
||||||
[[ -n "$DESCRIPTION" ]] && CMD="$CMD --description \"$DESCRIPTION\""
|
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
||||||
[[ -n "$DUE_DATE" ]] && CMD="$CMD --deadline \"$DUE_DATE\""
|
exit 1
|
||||||
eval "$CMD"
|
}
|
||||||
|
CMD=(tea milestones create --title "$TITLE")
|
||||||
|
[[ -n "$DESCRIPTION" ]] && CMD+=(--description "$DESCRIPTION")
|
||||||
|
[[ -n "$DUE_DATE" ]] && CMD+=(--deadline "$DUE_DATE")
|
||||||
|
"${CMD[@]}" $REPO_ARGS
|
||||||
echo "Milestone '$TITLE' created successfully"
|
echo "Milestone '$TITLE' created successfully"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
@@ -31,12 +31,16 @@ while [[ $# -gt 0 ]]; do
|
|||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh api "/repos/{owner}/{repo}/milestones?state=$STATE" --jq '.[] | "\(.title) (\(.state)) - \(.open_issues) open, \(.closed_issues) closed"'
|
gh api "/repos/{owner}/{repo}/milestones?state=$STATE" --jq '.[] | "\(.title) (\(.state)) - \(.open_issues) open, \(.closed_issues) closed"'
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
tea milestone list
|
REPO_ARGS=$(get_gitea_repo_args) || {
|
||||||
|
echo "Error: Could not resolve Gitea repo/login for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
tea milestone list $REPO_ARGS
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ PR_NUMBER=""
|
|||||||
TIMEOUT_SEC=1800
|
TIMEOUT_SEC=1800
|
||||||
INTERVAL_SEC=15
|
INTERVAL_SEC=15
|
||||||
REPO_OVERRIDE=""
|
REPO_OVERRIDE=""
|
||||||
|
HOST_OVERRIDE=""
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
@@ -19,6 +20,7 @@ Usage: $(basename "$0") -n <pr_number> [-t timeout_sec] [-i interval_sec]
|
|||||||
Options:
|
Options:
|
||||||
-n, --number NUMBER PR number (required)
|
-n, --number NUMBER PR number (required)
|
||||||
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
-r, --repo OWNER/REPO Repository slug (default: infer from git origin)
|
||||||
|
--host HOST Gitea host for --repo API calls (or set GITEA_HOST/GITEA_URL)
|
||||||
-t, --timeout SECONDS Max wait time in seconds (default: 1800)
|
-t, --timeout SECONDS Max wait time in seconds (default: 1800)
|
||||||
-i, --interval SECONDS Poll interval in seconds (default: 15)
|
-i, --interval SECONDS Poll interval in seconds (default: 15)
|
||||||
-h, --help Show this help
|
-h, --help Show this help
|
||||||
@@ -124,7 +126,7 @@ gitea_get_pr_head_sha() {
|
|||||||
local repo="$2"
|
local repo="$2"
|
||||||
local token="$3"
|
local token="$3"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/pulls/${PR_NUMBER}"
|
local url="https://${host}/api/v1/repos/${repo}/pulls/${PR_NUMBER}"
|
||||||
curl -fsSL -H "Authorization: token ${token}" "$url" | python3 -c '
|
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url" | python3 -c '
|
||||||
import json, sys
|
import json, sys
|
||||||
data = json.load(sys.stdin)
|
data = json.load(sys.stdin)
|
||||||
print((data.get("head") or {}).get("sha", ""))
|
print((data.get("head") or {}).get("sha", ""))
|
||||||
@@ -137,7 +139,7 @@ gitea_get_commit_status_json() {
|
|||||||
local token="$3"
|
local token="$3"
|
||||||
local sha="$4"
|
local sha="$4"
|
||||||
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
local url="https://${host}/api/v1/repos/${repo}/commits/${sha}/status"
|
||||||
curl -fsSL -H "Authorization: token ${token}" "$url"
|
curl -fsSL -H "User-Agent: curl/8" -H "Authorization: token ${token}" "$url"
|
||||||
}
|
}
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
@@ -150,6 +152,10 @@ while [[ $# -gt 0 ]]; do
|
|||||||
REPO_OVERRIDE="$2"
|
REPO_OVERRIDE="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
--host)
|
||||||
|
HOST_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-t|--timeout)
|
-t|--timeout)
|
||||||
TIMEOUT_SEC="$2"
|
TIMEOUT_SEC="$2"
|
||||||
shift 2
|
shift 2
|
||||||
@@ -211,7 +217,19 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
fi
|
fi
|
||||||
echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
echo "[pr-ci-wait] Platform=github PR=#${PR_NUMBER} head_sha=${HEAD_SHA}"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
|
if [[ -n "$HOST_OVERRIDE" ]]; then
|
||||||
|
HOST="$HOST_OVERRIDE"
|
||||||
|
elif [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
HOST=$(get_gitea_api_host_for_repo_override) || {
|
||||||
|
echo "Error: Gitea host is required with --repo. Pass --host or set GITEA_HOST/GITEA_URL." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
HOST=$(get_remote_host) || {
|
||||||
|
echo "Error: Could not determine Gitea host from git origin." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
TOKEN=$(get_gitea_token "$HOST") || {
|
TOKEN=$(get_gitea_token "$HOST") || {
|
||||||
echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
|
echo "Error: Gitea token not found. Set GITEA_TOKEN or configure ~/.git-credentials." >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ if [[ -z "$PR_NUMBER" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
if [[ -n "$COMMENT" ]]; then
|
if [[ -n "$COMMENT" ]]; then
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ param(
|
|||||||
[Alias("b")]
|
[Alias("b")]
|
||||||
[string]$Body,
|
[string]$Body,
|
||||||
|
|
||||||
[Alias("B")]
|
|
||||||
[string]$Base,
|
[string]$Base,
|
||||||
|
|
||||||
[Alias("H")]
|
[Alias("H")]
|
||||||
@@ -101,6 +100,11 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
$cmd = @("tea", "pr", "create", "--title", $Title)
|
$cmd = @("tea", "pr", "create", "--title", $Title)
|
||||||
if ($Body) { $cmd += @("--description", $Body) }
|
if ($Body) { $cmd += @("--description", $Body) }
|
||||||
if ($Base) { $cmd += @("--base", $Base) }
|
if ($Base) { $cmd += @("--base", $Base) }
|
||||||
@@ -108,7 +112,7 @@ switch ($platform) {
|
|||||||
if ($Labels) { $cmd += @("--labels", $Labels) }
|
if ($Labels) { $cmd += @("--labels", $Labels) }
|
||||||
|
|
||||||
if ($Milestone) {
|
if ($Milestone) {
|
||||||
$milestoneList = tea milestones list 2>$null
|
$milestoneList = tea milestones list @repoArgs 2>$null
|
||||||
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
$milestoneId = ($milestoneList | Select-String "^\s*(\d+).*$Milestone" | ForEach-Object { $_.Matches.Groups[1].Value } | Select-Object -First 1)
|
||||||
if ($milestoneId) {
|
if ($milestoneId) {
|
||||||
$cmd += @("--milestone", $milestoneId)
|
$cmd += @("--milestone", $milestoneId)
|
||||||
@@ -121,6 +125,7 @@ switch ($platform) {
|
|||||||
Write-Warning "Draft PR may not be supported by your tea version"
|
Write-Warning "Draft PR may not be supported by your tea version"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ PY
|
|||||||
|
|
||||||
url="https://${host}/api/v1/repos/${repo}/pulls"
|
url="https://${host}/api/v1/repos/${repo}/pulls"
|
||||||
curl -fsS -X POST \
|
curl -fsS -X POST \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
-H "Authorization: token ${token}" \
|
-H "Authorization: token ${token}" \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
@@ -177,7 +178,12 @@ case "$PLATFORM" in
|
|||||||
# is unreliable in Mosaic worktrees/profile shells. Use arrays instead
|
# is unreliable in Mosaic worktrees/profile shells. Use arrays instead
|
||||||
# of eval so markdown backticks/body content are not shell-executed.
|
# of eval so markdown backticks/body content are not shell-executed.
|
||||||
REPO_SLUG=$(get_repo_slug)
|
REPO_SLUG=$(get_repo_slug)
|
||||||
REPO_ARGS=(--repo "$REPO_SLUG" --login "${GITEA_LOGIN:-mosaicstack}")
|
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
||||||
|
echo "Warning: could not resolve Gitea login for tea; trying Gitea API fallback..." >&2
|
||||||
|
gitea_pr_create_api
|
||||||
|
exit $?
|
||||||
|
}
|
||||||
|
REPO_ARGS=(--repo "$REPO_SLUG" --login "$GITEA_LOGIN_NAME")
|
||||||
CMD=(tea pr create "${REPO_ARGS[@]}" --title "$TITLE")
|
CMD=(tea pr create "${REPO_ARGS[@]}" --title "$TITLE")
|
||||||
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
[[ -n "$BODY" ]] && CMD+=(--description "$BODY")
|
||||||
[[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
|
[[ -n "$BASE_BRANCH" ]] && CMD+=(--base "$BASE_BRANCH")
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ source "$SCRIPT_DIR/detect-platform.sh"
|
|||||||
PR_NUMBER=""
|
PR_NUMBER=""
|
||||||
OUTPUT_FILE=""
|
OUTPUT_FILE=""
|
||||||
REPO_OVERRIDE=""
|
REPO_OVERRIDE=""
|
||||||
|
HOST_OVERRIDE=""
|
||||||
|
|
||||||
while [[ $# -gt 0 ]]; do
|
while [[ $# -gt 0 ]]; do
|
||||||
case $1 in
|
case $1 in
|
||||||
@@ -26,12 +27,17 @@ while [[ $# -gt 0 ]]; do
|
|||||||
REPO_OVERRIDE="$2"
|
REPO_OVERRIDE="$2"
|
||||||
shift 2
|
shift 2
|
||||||
;;
|
;;
|
||||||
|
--host)
|
||||||
|
HOST_OVERRIDE="$2"
|
||||||
|
shift 2
|
||||||
|
;;
|
||||||
-h|--help)
|
-h|--help)
|
||||||
echo "Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [-o <output_file>]"
|
echo "Usage: pr-diff.sh -n <pr_number> [-r owner/repo] [--host host] [-o <output_file>]"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Options:"
|
echo "Options:"
|
||||||
echo " -n, --number PR number (required)"
|
echo " -n, --number PR number (required)"
|
||||||
echo " -r, --repo Repository slug (default: infer from git origin)"
|
echo " -r, --repo Repository slug (default: infer from git origin)"
|
||||||
|
echo " --host Gitea host for --repo API calls (or set GITEA_HOST/GITEA_URL)"
|
||||||
echo " -o, --output Output file (optional, prints to stdout if omitted)"
|
echo " -o, --output Output file (optional, prints to stdout if omitted)"
|
||||||
echo " -h, --help Show this help"
|
echo " -h, --help Show this help"
|
||||||
exit 0
|
exit 0
|
||||||
@@ -69,16 +75,28 @@ if [[ "$PLATFORM" == "github" ]]; then
|
|||||||
fi
|
fi
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
# tea doesn't have a direct diff command — use the API
|
# tea doesn't have a direct diff command — use the API
|
||||||
HOST=$(get_remote_host 2>/dev/null || echo "git.mosaicstack.dev")
|
if [[ -n "$HOST_OVERRIDE" ]]; then
|
||||||
|
HOST="$HOST_OVERRIDE"
|
||||||
|
elif [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
HOST=$(get_gitea_api_host_for_repo_override) || {
|
||||||
|
echo "Error: Gitea host is required with --repo. Pass --host or set GITEA_HOST/GITEA_URL." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
HOST=$(get_remote_host) || {
|
||||||
|
echo "Error: Could not determine Gitea host from git origin." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
|
||||||
DIFF_URL="https://${HOST}/api/v1/repos/${REPO_INFO}/pulls/${PR_NUMBER}.diff"
|
DIFF_URL="https://${HOST}/api/v1/repos/${REPO_INFO}/pulls/${PR_NUMBER}.diff"
|
||||||
|
|
||||||
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
GITEA_API_TOKEN=$(get_gitea_token "$HOST" || true)
|
||||||
|
|
||||||
if [[ -n "$GITEA_API_TOKEN" ]]; then
|
if [[ -n "$GITEA_API_TOKEN" ]]; then
|
||||||
DIFF_CONTENT=$(curl -sS -H "Authorization: token $GITEA_API_TOKEN" "$DIFF_URL")
|
DIFF_CONTENT=$(curl -sS -H "User-Agent: curl/8" -H "Authorization: token $GITEA_API_TOKEN" "$DIFF_URL")
|
||||||
else
|
else
|
||||||
DIFF_CONTENT=$(curl -sS "$DIFF_URL")
|
DIFF_CONTENT=$(curl -sS -H "User-Agent: curl/8" "$DIFF_URL")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n "$OUTPUT_FILE" ]]; then
|
if [[ -n "$OUTPUT_FILE" ]]; then
|
||||||
|
|||||||
@@ -58,6 +58,11 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
$cmd = @("tea", "pr", "list", "--state", $State, "--limit", $Limit)
|
$cmd = @("tea", "pr", "list", "--state", $State, "--limit", $Limit)
|
||||||
|
|
||||||
if ($Label) {
|
if ($Label) {
|
||||||
@@ -67,6 +72,7 @@ switch ($platform) {
|
|||||||
Write-Warning "Author filtering may require manual review for Gitea"
|
Write-Warning "Author filtering may require manual review for Gitea"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -93,7 +93,18 @@ case "$PLATFORM" in
|
|||||||
"${CMD[@]}"
|
"${CMD[@]}"
|
||||||
;;
|
;;
|
||||||
gitea)
|
gitea)
|
||||||
CMD=(tea pr list --repo "$REPO_INFO" --login "${GITEA_LOGIN:-mosaicstack}" --state "$STATE" --limit "$LIMIT")
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login_for_repo_override) || {
|
||||||
|
echo "Error: Could not resolve Gitea login for --repo override. Set GITEA_LOGIN or configure a default tea login." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
||||||
|
echo "Error: Could not resolve Gitea login for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
CMD=(tea pr list --repo "$REPO_INFO" --login "$GITEA_LOGIN_NAME" --state "$STATE" --limit "$LIMIT")
|
||||||
|
|
||||||
# tea filtering may be limited
|
# tea filtering may be limited
|
||||||
if [[ -n "$LABEL" ]]; then
|
if [[ -n "$LABEL" ]]; then
|
||||||
|
|||||||
@@ -74,6 +74,11 @@ switch ($platform) {
|
|||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
"gitea" {
|
"gitea" {
|
||||||
|
$repoArgs = @(Get-GiteaRepoArgs)
|
||||||
|
if ($repoArgs.Length -eq 0) {
|
||||||
|
Write-Error "Could not resolve Gitea repo/login for remote host"
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
if (-not $SkipQueueGuard) {
|
if (-not $SkipQueueGuard) {
|
||||||
$timeout = if ($env:MOSAIC_CI_QUEUE_TIMEOUT_SEC) { [int]$env:MOSAIC_CI_QUEUE_TIMEOUT_SEC } else { 900 }
|
$timeout = if ($env:MOSAIC_CI_QUEUE_TIMEOUT_SEC) { [int]$env:MOSAIC_CI_QUEUE_TIMEOUT_SEC } else { 900 }
|
||||||
$interval = if ($env:MOSAIC_CI_QUEUE_POLL_SEC) { [int]$env:MOSAIC_CI_QUEUE_POLL_SEC } else { 15 }
|
$interval = if ($env:MOSAIC_CI_QUEUE_POLL_SEC) { [int]$env:MOSAIC_CI_QUEUE_POLL_SEC } else { 15 }
|
||||||
@@ -87,6 +92,7 @@ switch ($platform) {
|
|||||||
Write-Warning "Branch deletion after merge may need to be done separately with tea"
|
Write-Warning "Branch deletion after merge may need to be done separately with tea"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$cmd += $repoArgs
|
||||||
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
& $cmd[0] $cmd[1..($cmd.Length-1)]
|
||||||
}
|
}
|
||||||
default {
|
default {
|
||||||
|
|||||||
@@ -106,34 +106,6 @@ PLATFORM=$(detect_platform)
|
|||||||
OWNER=$(get_repo_owner)
|
OWNER=$(get_repo_owner)
|
||||||
REPO=$(get_repo_name)
|
REPO=$(get_repo_name)
|
||||||
|
|
||||||
find_tea_login_for_host() {
|
|
||||||
local host="$1"
|
|
||||||
local logins_json
|
|
||||||
|
|
||||||
command -v tea >/dev/null 2>&1 || return 1
|
|
||||||
logins_json=$(tea login list --output json 2>/dev/null) || return 1
|
|
||||||
TEA_LOGINS_JSON="$logins_json" python3 - "$host" <<'PY'
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
|
|
||||||
host = sys.argv[1]
|
|
||||||
try:
|
|
||||||
logins = json.loads(os.environ.get("TEA_LOGINS_JSON", "[]"))
|
|
||||||
except Exception:
|
|
||||||
raise SystemExit(1)
|
|
||||||
|
|
||||||
for login in logins if isinstance(logins, list) else []:
|
|
||||||
url = str(login.get("url") or login.get("URL") or "")
|
|
||||||
name = str(login.get("name") or login.get("Name") or "")
|
|
||||||
if url.rstrip("/").endswith(host) and name:
|
|
||||||
print(name)
|
|
||||||
raise SystemExit(0)
|
|
||||||
|
|
||||||
raise SystemExit(1)
|
|
||||||
PY
|
|
||||||
}
|
|
||||||
|
|
||||||
is_known_tea_empty_identity_failure() {
|
is_known_tea_empty_identity_failure() {
|
||||||
local error_file="$1"
|
local error_file="$1"
|
||||||
|
|
||||||
@@ -164,6 +136,7 @@ merge_gitea_with_api() {
|
|||||||
if [[ -n "$token" ]]; then
|
if [[ -n "$token" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
||||||
-X POST \
|
-X POST \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
-H "Authorization: token $token" \
|
-H "Authorization: token $token" \
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
@@ -179,6 +152,7 @@ merge_gitea_with_api() {
|
|||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" \
|
||||||
-X POST \
|
-X POST \
|
||||||
-u "$basic_auth" \
|
-u "$basic_auth" \
|
||||||
|
-H "User-Agent: curl/8" \
|
||||||
-H 'Content-Type: application/json' \
|
-H 'Content-Type: application/json' \
|
||||||
-d "$payload" \
|
-d "$payload" \
|
||||||
"$api_url" || true)
|
"$api_url" || true)
|
||||||
@@ -214,7 +188,7 @@ if [[ "$DRY_RUN" == true ]]; then
|
|||||||
echo "Error: Cannot determine host from origin remote URL" >&2
|
echo "Error: Cannot determine host from origin remote URL" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
TEA_LOGIN="${GITEA_LOGIN:-$(find_tea_login_for_host "$HOST" || true)}"
|
TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
|
||||||
if [[ -n "$TEA_LOGIN" ]]; then
|
if [[ -n "$TEA_LOGIN" ]]; then
|
||||||
echo "Dry run: would merge PR #$PR_NUMBER on $HOST with tea login '$TEA_LOGIN' (base=$BASE_BRANCH, method=squash)."
|
echo "Dry run: would merge PR #$PR_NUMBER on $HOST with tea login '$TEA_LOGIN' (base=$BASE_BRANCH, method=squash)."
|
||||||
else
|
else
|
||||||
@@ -237,7 +211,7 @@ case "$PLATFORM" in
|
|||||||
echo "Error: Cannot determine host from origin remote URL" >&2
|
echo "Error: Cannot determine host from origin remote URL" >&2
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
TEA_LOGIN="${GITEA_LOGIN:-$(find_tea_login_for_host "$HOST" || true)}"
|
TEA_LOGIN="$(get_gitea_login_for_host "$HOST" || true)"
|
||||||
|
|
||||||
if [[ -n "$TEA_LOGIN" ]]; then
|
if [[ -n "$TEA_LOGIN" ]]; then
|
||||||
mkdir -p "${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
mkdir -p "${AGENT_WORK_ROOT:-/home/hermes/agent-work}"
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ curl_gitea_pull() {
|
|||||||
|
|
||||||
token=$(get_gitea_token "$HOST" || true)
|
token=$(get_gitea_token "$HOST" || true)
|
||||||
if [[ -n "$token" ]]; then
|
if [[ -n "$token" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -H "Authorization: token $token" "$api_url" || true)
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -H "User-Agent: curl/8" -H "Authorization: token $token" "$api_url" || true)
|
||||||
if [[ "$raw_code" =~ ^2 ]]; then
|
if [[ "$raw_code" =~ ^2 ]]; then
|
||||||
cat "$body_file"
|
cat "$body_file"
|
||||||
rm -f "$body_file"
|
rm -f "$body_file"
|
||||||
@@ -70,7 +70,7 @@ curl_gitea_pull() {
|
|||||||
|
|
||||||
basic_auth=$(get_gitea_basic_auth "$HOST" || true)
|
basic_auth=$(get_gitea_basic_auth "$HOST" || true)
|
||||||
if [[ -n "$basic_auth" ]]; then
|
if [[ -n "$basic_auth" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -u "$basic_auth" "$api_url" || true)
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -u "$basic_auth" -H "User-Agent: curl/8" "$api_url" || true)
|
||||||
if [[ "$raw_code" =~ ^2 ]]; then
|
if [[ "$raw_code" =~ ^2 ]]; then
|
||||||
cat "$body_file"
|
cat "$body_file"
|
||||||
rm -f "$body_file"
|
rm -f "$body_file"
|
||||||
@@ -80,7 +80,7 @@ curl_gitea_pull() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -z "${http_code:-}" ]]; then
|
if [[ -z "${http_code:-}" ]]; then
|
||||||
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" "$api_url" || true)
|
raw_code=$(curl -sS -w '%{http_code}' -o "$body_file" -H "User-Agent: curl/8" "$api_url" || true)
|
||||||
http_code="$raw_code"
|
http_code="$raw_code"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ if [[ -z "$ACTION" ]]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
detect_platform
|
detect_platform >/dev/null
|
||||||
|
|
||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
case $ACTION in
|
case $ACTION in
|
||||||
|
|||||||
@@ -58,7 +58,18 @@ fi
|
|||||||
if [[ "$PLATFORM" == "github" ]]; then
|
if [[ "$PLATFORM" == "github" ]]; then
|
||||||
gh pr view "$PR_NUMBER" --repo "$REPO_INFO"
|
gh pr view "$PR_NUMBER" --repo "$REPO_INFO"
|
||||||
elif [[ "$PLATFORM" == "gitea" ]]; then
|
elif [[ "$PLATFORM" == "gitea" ]]; then
|
||||||
tea pr "$PR_NUMBER" --repo "$REPO_INFO" --login "${GITEA_LOGIN:-mosaicstack}"
|
if [[ -n "$REPO_OVERRIDE" ]]; then
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login_for_repo_override) || {
|
||||||
|
echo "Error: Could not resolve Gitea login for --repo override. Set GITEA_LOGIN or configure a default tea login." >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
else
|
||||||
|
GITEA_LOGIN_NAME=$(get_gitea_login) || {
|
||||||
|
echo "Error: Could not resolve Gitea login for remote host" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
fi
|
||||||
|
tea pr "$PR_NUMBER" --repo "$REPO_INFO" --login "$GITEA_LOGIN_NAME"
|
||||||
else
|
else
|
||||||
echo "Error: Unknown platform"
|
echo "Error: Unknown platform"
|
||||||
exit 1
|
exit 1
|
||||||
|
|||||||
233
packages/mosaic/framework/tools/git/test-gitea-login-resolution.sh
Executable file
233
packages/mosaic/framework/tools/git/test-gitea-login-resolution.sh
Executable file
@@ -0,0 +1,233 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Regression harness for host-specific Gitea tea login resolution.
|
||||||
|
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
WORK_DIR="${MOSAIC_TEST_WORK_DIR:-$PWD/.mosaic-test-work/gitea-login-resolution}"
|
||||||
|
REPO_DIR="$WORK_DIR/repo"
|
||||||
|
BIN_DIR="$WORK_DIR/bin"
|
||||||
|
LOG_FILE="$WORK_DIR/calls.log"
|
||||||
|
CREDENTIALS_FILE="$WORK_DIR/credentials.json"
|
||||||
|
|
||||||
|
rm -rf "$WORK_DIR"
|
||||||
|
mkdir -p "$REPO_DIR" "$BIN_DIR"
|
||||||
|
|
||||||
|
git -C "$REPO_DIR" init -q
|
||||||
|
git -C "$REPO_DIR" remote add origin https://git.uscllc.com/USC/uconnect.git
|
||||||
|
|
||||||
|
cat > "$CREDENTIALS_FILE" <<'JSON'
|
||||||
|
{
|
||||||
|
"gitea": {
|
||||||
|
"mosaicstack": {
|
||||||
|
"url": "https://git.mosaicstack.dev",
|
||||||
|
"token": "mosaic-token"
|
||||||
|
},
|
||||||
|
"usc": {
|
||||||
|
"url": "https://git.uscllc.com",
|
||||||
|
"token": "usc-token"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
JSON
|
||||||
|
|
||||||
|
cat > "$BIN_DIR/tea" <<'SH'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
if [[ "$*" == "login list --output json" ]]; then
|
||||||
|
cat <<'JSON'
|
||||||
|
[
|
||||||
|
{"name":"evil-usc","url":"https://evilgit.uscllc.com","user":"bad.actor"},
|
||||||
|
{"name":"usc","url":"https://git.uscllc.com","user":"jason.woltje"}
|
||||||
|
]
|
||||||
|
JSON
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
printf 'tea %s\n' "$*" >> "$MOSAIC_TEST_LOG"
|
||||||
|
if [[ "${MOSAIC_TEA_FAIL_PR_CREATE:-}" == "1" && "$*" == pr\ create* ]]; then
|
||||||
|
echo 'GetUserByName: simulated stale login failure' >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
SH
|
||||||
|
|
||||||
|
cat > "$BIN_DIR/curl" <<'SH'
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
printf 'curl %s\n' "$*" >> "$MOSAIC_TEST_LOG"
|
||||||
|
url="${*: -1}"
|
||||||
|
case "$url" in
|
||||||
|
*/pulls/*.diff)
|
||||||
|
printf 'diff --git a/file b/file\n'
|
||||||
|
;;
|
||||||
|
*/pulls/*)
|
||||||
|
printf '{"head":{"sha":"abc123"}}'
|
||||||
|
;;
|
||||||
|
*/commits/*/status)
|
||||||
|
printf '{"state":"success","statuses":[{"context":"ci/mock","status":"success"}]}'
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
printf '{}'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
SH
|
||||||
|
|
||||||
|
chmod +x "$BIN_DIR/tea" "$BIN_DIR/curl"
|
||||||
|
|
||||||
|
run_in_repo() {
|
||||||
|
(
|
||||||
|
cd "$REPO_DIR"
|
||||||
|
PATH="$BIN_DIR:$PATH" \
|
||||||
|
MOSAIC_CREDENTIALS_FILE="$CREDENTIALS_FILE" \
|
||||||
|
MOSAIC_TEST_LOG="$LOG_FILE" \
|
||||||
|
"$@"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
usc_login=$(run_in_repo bash -c '
|
||||||
|
export GITEA_LOGIN=mosaicstack
|
||||||
|
export GITEA_URL=https://git.mosaicstack.dev
|
||||||
|
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
||||||
|
get_gitea_login
|
||||||
|
')
|
||||||
|
if [[ "$usc_login" != "usc" ]]; then
|
||||||
|
echo "Expected USC host to resolve tea login 'usc' despite stale mosaicstack env; got '$usc_login'" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
usc_login_with_usc_url=$(run_in_repo bash -c '
|
||||||
|
export GITEA_LOGIN=mosaicstack
|
||||||
|
export GITEA_URL=https://git.uscllc.com
|
||||||
|
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
||||||
|
get_gitea_login
|
||||||
|
')
|
||||||
|
if [[ "$usc_login_with_usc_url" != "usc" ]]; then
|
||||||
|
echo "Expected USC host to reject stale GITEA_LOGIN even when GITEA_URL matches USC; got '$usc_login_with_usc_url'" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
usc_login_without_url=$(run_in_repo bash -c '
|
||||||
|
export GITEA_LOGIN=mosaicstack
|
||||||
|
unset GITEA_URL
|
||||||
|
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
||||||
|
get_gitea_login
|
||||||
|
')
|
||||||
|
if [[ "$usc_login_without_url" != "usc" ]]; then
|
||||||
|
echo "Expected USC host to ignore unmatched GITEA_LOGIN without URL; got '$usc_login_without_url'" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
git -C "$REPO_DIR" remote set-url origin https://hermes:token@git.uscllc.com/USC/uconnect.git
|
||||||
|
embedded_host=$(run_in_repo bash -c '
|
||||||
|
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
||||||
|
get_remote_host
|
||||||
|
')
|
||||||
|
if [[ "$embedded_host" != "git.uscllc.com" ]]; then
|
||||||
|
echo "Expected credential-bearing remote host to strip userinfo; got '$embedded_host'" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
git -C "$REPO_DIR" remote set-url origin https://git.uscllc.com/USC/uconnect.git
|
||||||
|
|
||||||
|
override_login=$(run_in_repo bash -c '
|
||||||
|
export GITEA_LOGIN=usc
|
||||||
|
source "'"$SCRIPT_DIR"'/detect-platform.sh"
|
||||||
|
get_gitea_login_for_repo_override
|
||||||
|
')
|
||||||
|
if [[ "$override_login" != "usc" ]]; then
|
||||||
|
echo "Expected --repo override path to honor explicit GITEA_LOGIN; got '$override_login'" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
git -C "$REPO_DIR" remote set-url origin https://git.mosaicstack.dev/mosaicstack/stack.git
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo env GITEA_LOGIN=usc "$SCRIPT_DIR/issue-list.sh" --repo USC/uconnect -n 1
|
||||||
|
grep -q -- 'tea issues list --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
git -C "$REPO_DIR" remote set-url origin https://git.uscllc.com/USC/uconnect.git
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo "$SCRIPT_DIR/issue-close.sh" -i 42
|
||||||
|
grep -q -- 'tea issue close 42 --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
if grep -q -- '--login mosaicstack' "$LOG_FILE"; then
|
||||||
|
echo "issue-close.sh used hardcoded mosaicstack login on USC host" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo "$SCRIPT_DIR/milestone-list.sh"
|
||||||
|
grep -q -- 'tea milestone list --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo "$SCRIPT_DIR/milestone-create.sh" -t "0.2.0" -d "USC milestone"
|
||||||
|
grep -q -- 'tea milestones create --title 0.2.0 --description USC milestone --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo "$SCRIPT_DIR/milestone-close.sh" -t "0.2.0"
|
||||||
|
grep -q -- 'tea milestone close 0.2.0 --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
if command -v pwsh >/dev/null 2>&1; then
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/issue-list.ps1" -Limit 1
|
||||||
|
grep -q -- 'tea issues list --state open --limit 1 --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/issue-create.ps1" -Title "PowerShell issue"
|
||||||
|
grep -q -- 'tea issue create --title PowerShell issue --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/pr-list.ps1" -Limit 1
|
||||||
|
grep -q -- 'tea pr list --state open --limit 1 --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/pr-create.ps1" -Title "PowerShell PR"
|
||||||
|
grep -q -- 'tea pr create --title PowerShell PR --head master --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/pr-merge.ps1" -Number 42 -SkipQueueGuard
|
||||||
|
grep -q -- 'tea pr merge 42 --style squash --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo pwsh -NoProfile -File "$SCRIPT_DIR/milestone-create.ps1" -List
|
||||||
|
grep -q -- 'tea milestones list --repo USC/uconnect --login usc' "$LOG_FILE"
|
||||||
|
fi
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
if run_in_repo "$SCRIPT_DIR/pr-diff.sh" --repo USC/uconnect -n 7 >/dev/null 2>&1; then
|
||||||
|
echo "Expected pr-diff.sh --repo without host to fail loud" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
if grep -q -- 'git.mosaicstack.dev/api/v1/repos/USC/uconnect' "$LOG_FILE"; then
|
||||||
|
echo "pr-diff.sh --repo defaulted API host to git.mosaicstack.dev" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo env GITEA_URL=https://git.uscllc.com "$SCRIPT_DIR/pr-diff.sh" --repo USC/uconnect -n 7 >/dev/null
|
||||||
|
grep -q -- 'curl .*https://git.uscllc.com/api/v1/repos/USC/uconnect/pulls/7.diff' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo "$SCRIPT_DIR/pr-ci-wait.sh" --repo USC/uconnect --host git.uscllc.com -n 9 -t 2 -i 1
|
||||||
|
grep -q -- 'curl .*https://git.uscllc.com/api/v1/repos/USC/uconnect/pulls/9' "$LOG_FILE"
|
||||||
|
grep -q -- 'curl .*https://git.uscllc.com/api/v1/repos/USC/uconnect/commits/abc123/status' "$LOG_FILE"
|
||||||
|
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo env MOSAIC_TEA_FAIL_PR_CREATE=1 GITEA_TOKEN=usc-token GITEA_URL=https://git.uscllc.com "$SCRIPT_DIR/pr-create.sh" -t "USC API fallback" -H feature/pr-create
|
||||||
|
grep -q -- 'tea pr create --repo USC/uconnect --login usc --title USC API fallback --head feature/pr-create' "$LOG_FILE"
|
||||||
|
grep -q -- 'curl .*Authorization: token usc-token .*https://git.uscllc.com/api/v1/repos/USC/uconnect/pulls' "$LOG_FILE"
|
||||||
|
if grep -q -- 'git.mosaicstack.dev/api/v1/repos/USC/uconnect/pulls' "$LOG_FILE"; then
|
||||||
|
echo "pr-create.sh API fallback defaulted USC repo to git.mosaicstack.dev" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
git -C "$REPO_DIR" remote set-url origin https://git.mosaicstack.dev/mosaicstack/stack.git
|
||||||
|
: > "$LOG_FILE"
|
||||||
|
run_in_repo env GITEA_TOKEN=mosaic-token GITEA_URL=https://git.mosaicstack.dev "$SCRIPT_DIR/issue-close.sh" -i 536
|
||||||
|
grep -q -- 'curl .*https://git.mosaicstack.dev/api/v1/repos/mosaicstack/stack/issues/536' "$LOG_FILE"
|
||||||
|
if grep -q -- 'tea issue close 536 .*--login mosaicstack' "$LOG_FILE"; then
|
||||||
|
echo "issue-close.sh invented a mosaicstack tea login instead of using API fallback" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Gitea login resolution regression harness passed"
|
||||||
@@ -23,6 +23,10 @@ cat > "$MOCK_BIN/tea" <<'EOF'
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
||||||
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
||||||
|
if [[ "$*" == *"login list"* ]]; then
|
||||||
|
echo '[{"name":"git.mosaicstack.dev","url":"https://git.mosaicstack.dev"}]'
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
if [[ "$*" == *"pr merge"* ]]; then
|
if [[ "$*" == *"pr merge"* ]]; then
|
||||||
echo 'user does not exist [uid: 0, name: ]' >&2
|
echo 'user does not exist [uid: 0, name: ]' >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -99,6 +103,7 @@ git remote add origin https://git.mosaicstack.dev/mosaicstack/stack.git
|
|||||||
export PATH="$MOCK_BIN:$PATH"
|
export PATH="$MOCK_BIN:$PATH"
|
||||||
export PR_MERGE_TEST_LOG="$LOG_FILE"
|
export PR_MERGE_TEST_LOG="$LOG_FILE"
|
||||||
export GITEA_LOGIN="git.mosaicstack.dev"
|
export GITEA_LOGIN="git.mosaicstack.dev"
|
||||||
|
export GITEA_URL="https://git.mosaicstack.dev"
|
||||||
export GITEA_TOKEN="redacted-test-token"
|
export GITEA_TOKEN="redacted-test-token"
|
||||||
|
|
||||||
OUTPUT="$SANDBOX/output.log"
|
OUTPUT="$SANDBOX/output.log"
|
||||||
@@ -127,6 +132,10 @@ cat > "$MOCK_BIN/tea" <<'EOF'
|
|||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
printf 'tea %q ' "$@" >> "$PR_MERGE_TEST_LOG"
|
||||||
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
printf '\n' >> "$PR_MERGE_TEST_LOG"
|
||||||
|
if [[ "$*" == *"login list"* ]]; then
|
||||||
|
echo '[{"name":"git.mosaicstack.dev","url":"https://git.mosaicstack.dev"}]'
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
if [[ "$*" == *"pr merge"* ]]; then
|
if [[ "$*" == *"pr merge"* ]]; then
|
||||||
echo 'tea network timeout' >&2
|
echo 'tea network timeout' >&2
|
||||||
exit 2
|
exit 2
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mosaicstack/mosaic",
|
"name": "@mosaicstack/mosaic",
|
||||||
"version": "0.0.30",
|
"version": "0.0.31",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
|
"url": "https://git.mosaicstack.dev/mosaicstack/stack.git",
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ describe('Gitea git wrapper API calls', () => {
|
|||||||
(scriptName) => {
|
(scriptName) => {
|
||||||
const script = readGitTool(scriptName);
|
const script = readGitTool(scriptName);
|
||||||
|
|
||||||
expect(script).not.toContain('curl -fsS -H "Authorization: token');
|
expect(script).not.toMatch(/curl -fsS\s+(?:-H "[^"]+"\s+)*-H "Authorization: token/);
|
||||||
expect(script).toContain('curl -fsSL -H "Authorization: token');
|
expect(script).toMatch(/curl -fsSL\s+(?:-H "[^"]+"\s+)*-H "Authorization: token/);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user