Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2b18742

Browse files
committed
Merge remote-tracking branch 'origin/main' into ssncferreira/feat-site-tasks-notifications-disabled
2 parents2a83682 +ebbdfa0 commit2b18742

File tree

6 files changed

+43
-14
lines changed

6 files changed

+43
-14
lines changed

‎.github/.linkspector.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ignorePatterns:
2727
-pattern:"splunk.com"
2828
-pattern:"stackoverflow.com/questions"
2929
-pattern:"developer.hashicorp.com/terraform/language"
30-
-pattern:"platform.openai.com/docs/api-reference"
30+
-pattern:"platform.openai.com"
3131
-pattern:"api.openai.com"
3232
aliveStatusCodes:
3333
-200

‎coderd/agentapi/api.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ type Options struct {
6969
WorkspaceID uuid.UUID
7070
OrganizationID uuid.UUID
7171

72-
Ctx context.Context
72+
AuthenticatedCtx context.Context
7373
Log slog.Logger
7474
Clock quartz.Clock
7575
Database database.Store
@@ -220,7 +220,7 @@ func New(opts Options, workspace database.Workspace) *API {
220220

221221
// Start background cache refresh loop to handle workspace changes
222222
// like prebuild claims where owner_id and other fields may be modified in the DB.
223-
goapi.startCacheRefreshLoop(opts.Ctx)
223+
goapi.startCacheRefreshLoop(opts.AuthenticatedCtx)
224224

225225
returnapi
226226
}

‎coderd/agentapi/metadata_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -671,15 +671,15 @@ func TestBatchUpdateMetadata(t *testing.T) {
671671

672672
// Create full API with cached workspace fields (initial state)
673673
api:=agentapi.New(agentapi.Options{
674-
Ctx:ctxWithActor,
675-
AgentID:agentID,
676-
WorkspaceID:workspaceID,
677-
OwnerID:ownerID,
678-
OrganizationID:orgID,
679-
Database:dbauthz.New(dbM,auth,testutil.Logger(t),accessControlStore),
680-
Log:testutil.Logger(t),
681-
Clock:mClock,
682-
Pubsub:pub,
674+
AuthenticatedCtx:ctxWithActor,
675+
AgentID:agentID,
676+
WorkspaceID:workspaceID,
677+
OwnerID:ownerID,
678+
OrganizationID:orgID,
679+
Database:dbauthz.New(dbM,auth,testutil.Logger(t),accessControlStore),
680+
Log:testutil.Logger(t),
681+
Clock:mClock,
682+
Pubsub:pub,
683683
},initialWorkspace)// Cache is initialized with 9am schedule and "my-workspace" name
684684

685685
// Wait for ticker to be set up and release it so it can fire

‎coderd/workspaceagentsrpc.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ func (api *API) workspaceAgentRPC(rw http.ResponseWriter, r *http.Request) {
132132
WorkspaceID:workspace.ID,
133133
OrganizationID:workspace.OrganizationID,
134134

135-
Ctx:api.ctx,
135+
AuthenticatedCtx:ctx,
136136
Log:logger,
137137
Clock:api.Clock,
138138
Database:api.Database,

‎docs/ai-coder/ai-bridge/setup.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,34 @@ Set the following when routing [Amazon Bedrock](https://coder.com/docs/reference
5858
-`CODER_AIBRIDGE_BEDROCK_MODEL` or`--aibridge-bedrock-model`
5959
-`CODER_AIBRIDGE_BEDROCK_SMALL_FAST_MODEL` or`--aibridge-bedrock-small-fast-model`
6060

61+
####Obtaining Bedrock credentials
62+
63+
1.**Choose a region** where you want to use Bedrock.
64+
65+
2.**Generate API keys** in the[AWS Bedrock console](https://us-east-1.console.aws.amazon.com/bedrock/home?region=us-east-1#/api-keys/long-term/create) (replace`us-east-1` in the URL with your chosen region):
66+
- Choose an expiry period for the key.
67+
- Click**Generate**.
68+
- This creates an IAM user with strictly-scoped permissions for Bedrock access.
69+
70+
3.**Create an access key** for the IAM user:
71+
- After generating the API key, click**"You can directly modify permissions for the IAM user associated"**.
72+
- In the IAM user page, navigate to the**Security credentials** tab.
73+
- Under**Access keys**, click**Create access key**.
74+
- Select**"Application running outside AWS"** as the use case.
75+
- Click**Next**.
76+
- Add a description like "Coder AI Bridge token".
77+
- Click**Create access key**.
78+
- Save both the access key ID and secret access key securely.
79+
80+
4.**Configure your Coder deployment** with the credentials:
81+
82+
```sh
83+
export CODER_AIBRIDGE_BEDROCK_REGION=us-east-1
84+
export CODER_AIBRIDGE_BEDROCK_ACCESS_KEY=<your-access-key-id>
85+
export CODER_AIBRIDGE_BEDROCK_ACCESS_KEY_SECRET=<your-secret-access-key>
86+
coder server
87+
```
88+
6189
###Additional providers and Model Proxies
6290

6391
AI Bridge can relay traffic to other OpenAI- or Anthropic-compatible services or model proxies like LiteLLM by pointing the base URL variables above at the provider you operate. Share feedback or follow along in the[`aibridge`](https://github.com/coder/aibridge) issue tracker as we expand support for additional providers.

‎site/src/modules/dashboard/Navbar/DeploymentDropdown.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ export const DeploymentDropdown: FC<DeploymentDropdownProps> = ({
3434
!canViewConnectionLog&&
3535
!canViewOrganizations&&
3636
!canViewDeployment&&
37-
!canViewHealth
37+
!canViewHealth&&
38+
!canViewAIBridge
3839
){
3940
returnnull;
4041
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp