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
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

Commit2da0a05

Browse files
authored
chore: update API routes for images/registries (#220)
- This is part of an ongoing effort to standardize our API for public consumption. This fixes some routes that broke backwards compatibility (specifically image and registry routes).
1 parente52bd24 commit2da0a05

File tree

3 files changed

+31
-15
lines changed

3 files changed

+31
-15
lines changed

‎ci/integration/envs_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ search:
8181
}
8282
if!found {
8383
// ignore this error for now as it causes a race with other parallel tests
84-
_,_=client.ImportImage(ctx,org.ID,coder.ImportImageReq{
84+
_,_=client.ImportImage(ctx, coder.ImportImageReq{
8585
RegistryID:&dockerhubID,
86+
OrgID:org.ID,
8687
Repository:img,
8788
Tag:"latest",
8889
DefaultCPUCores:2.5,

‎coder-sdk/image.go

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package coder
33
import (
44
"context"
55
"net/http"
6+
"net/url"
67
"time"
78
)
89

@@ -36,6 +37,7 @@ type ImportImageReq struct {
3637
RegistryID*string`json:"registry_id"`// Used to import images to existing registries.
3738
NewRegistry*NewRegistryRequest`json:"new_registry"`// Used when adding a new registry.
3839
Repositorystring`json:"repository"`// Refers to the image. Ex: "codercom/ubuntu".
40+
OrgIDstring`json:"org_id"`
3941
Tagstring`json:"tag"`
4042
DefaultCPUCoresfloat32`json:"default_cpu_cores"`
4143
DefaultMemoryGBint`json:"default_memory_gb"`
@@ -56,29 +58,35 @@ type UpdateImageReq struct {
5658
}
5759

5860
// ImportImage creates a new image and optionally a new registry.
59-
func (cClient)ImportImage(ctx context.Context,orgIDstring,reqImportImageReq) (*Image,error) {
61+
func (cClient)ImportImage(ctx context.Context,reqImportImageReq) (*Image,error) {
6062
varimgImage
61-
iferr:=c.requestBody(ctx,http.MethodPost,"/api/private/orgs/"+orgID+"/images",req,&img);err!=nil {
63+
iferr:=c.requestBody(ctx,http.MethodPost,"/api/v0/images",req,&img);err!=nil {
6264
returnnil,err
6365
}
6466
return&img,nil
6567
}
6668

6769
// OrganizationImages returns all of the images imported for orgID.
6870
func (cClient)OrganizationImages(ctx context.Context,orgIDstring) ([]Image,error) {
69-
varimgs []Image
70-
iferr:=c.requestBody(ctx,http.MethodGet,"/api/private/orgs/"+orgID+"/images",nil,&imgs);err!=nil {
71+
var (
72+
imgs []Image
73+
query= url.Values{}
74+
)
75+
76+
query.Set("org",orgID)
77+
78+
iferr:=c.requestBody(ctx,http.MethodGet,"/api/v0/images",nil,&imgs,withQueryParams(query));err!=nil {
7179
returnnil,err
7280
}
7381
returnimgs,nil
7482
}
7583

7684
// UpdateImage applies a partial update to an image resource.
7785
func (cClient)UpdateImage(ctx context.Context,imageIDstring,reqUpdateImageReq)error {
78-
returnc.requestBody(ctx,http.MethodPatch,"/api/private/images/"+imageID,req,nil)
86+
returnc.requestBody(ctx,http.MethodPatch,"/api/v0/images/"+imageID,req,nil)
7987
}
8088

8189
// UpdateImageTags refreshes the latest digests for all tags of the image.
8290
func (cClient)UpdateImageTags(ctx context.Context,imageIDstring)error {
83-
returnc.requestBody(ctx,http.MethodPost,"/api/private/images/"+imageID+"/tags/update",nil,nil)
91+
returnc.requestBody(ctx,http.MethodPost,"/api/v0/images/"+imageID+"/tags/update",nil,nil)
8492
}

‎coder-sdk/registries.go

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package coder
33
import (
44
"context"
55
"net/http"
6+
"net/url"
67
"time"
78
)
89

@@ -18,17 +19,23 @@ type Registry struct {
1819

1920
// Registries fetches all registries in an organization.
2021
func (cClient)Registries(ctx context.Context,orgIDstring) ([]Registry,error) {
21-
varr []Registry
22-
iferr:=c.requestBody(ctx,http.MethodGet,"/api/private/orgs/"+orgID+"/registries",nil,&r);err!=nil {
22+
var (
23+
r []Registry
24+
query= url.Values{}
25+
)
26+
27+
query.Set("org",orgID)
28+
29+
iferr:=c.requestBody(ctx,http.MethodGet,"/api/v0/registries",nil,&r,withQueryParams(query));err!=nil {
2330
returnnil,err
2431
}
2532
returnr,nil
2633
}
2734

2835
// RegistryByID fetches a registry resource by its ID.
29-
func (cClient)RegistryByID(ctx context.Context,orgID,registryIDstring) (*Registry,error) {
36+
func (cClient)RegistryByID(ctx context.Context,registryIDstring) (*Registry,error) {
3037
varrRegistry
31-
iferr:=c.requestBody(ctx,http.MethodGet,"/api/private/orgs/"+orgID+"/registries/"+registryID,nil,&r);err!=nil {
38+
iferr:=c.requestBody(ctx,http.MethodGet,"/api/v0/registries/"+registryID,nil,&r);err!=nil {
3239
returnnil,err
3340
}
3441
return&r,nil
@@ -43,11 +50,11 @@ type UpdateRegistryReq struct {
4350
}
4451

4552
// UpdateRegistry applies a partial update to a registry resource.
46-
func (cClient)UpdateRegistry(ctx context.Context,orgID,registryIDstring,reqUpdateRegistryReq)error {
47-
returnc.requestBody(ctx,http.MethodPatch,"/api/private/orgs/"+orgID+"/registries/"+registryID,req,nil)
53+
func (cClient)UpdateRegistry(ctx context.Context,registryIDstring,reqUpdateRegistryReq)error {
54+
returnc.requestBody(ctx,http.MethodPatch,"/api/v0/registries/"+registryID,req,nil)
4855
}
4956

5057
// DeleteRegistry deletes a registry resource by its ID.
51-
func (cClient)DeleteRegistry(ctx context.Context,orgID,registryIDstring)error {
52-
returnc.requestBody(ctx,http.MethodDelete,"/api/private/orgs/"+orgID+"/registries/"+registryID,nil,nil)
58+
func (cClient)DeleteRegistry(ctx context.Context,registryIDstring)error {
59+
returnc.requestBody(ctx,http.MethodDelete,"/api/v0/registries/"+registryID,nil,nil)
5360
}

0 commit comments

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