Skip to content

Commit 97ca826

Browse files
loretoloreto
authored
Run go mod tidy with new go.jetify.com modules (#436)
## Community Contribution License All community contributions in this pull request are licensed to the project maintainers under the terms of the [Apache 2 license](https://www.apache.org/licenses/LICENSE-2.0). By creating this pull request I represent that I have the right to license the contributions to the project maintainers under the Apache 2 license. ## Summary Should make opensource compile again after the go.jetify.com change. Let's check in ASAP as it "fixes" the build. ## How was it tested? go build
1 parent 8ba60a7 commit 97ca826

File tree

19 files changed

+955
-491
lines changed

19 files changed

+955
-491
lines changed

‎api/devbox.lock

+3
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@
4848
"store_path": "/nix/store/ra19vmkcxdw1c4aq7rb9z8m8n9403rn9-buf-1.34.0"
4949
}
5050
}
51+
},
52+
"github:NixOS/nixpkgs/nixpkgs-unstable": {
53+
"resolved": "github:NixOS/nixpkgs/2d068ae5c6516b2d04562de50a58c682540de9bf?lastModified=1740303746&narHash=sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM%3D"
5154
}
5255
}
5356
}

‎api/docs/html/pub/sandbox/v1alpha1/index.html

+122-2
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,14 @@ <h2>Table of Contents</h2>
239239
</li>
240240

241241

242+
<li>
243+
<a href="#pub.sandbox.v1alpha1.MachineType"><span class="badge">E</span>MachineType</a>
244+
</li>
245+
246+
<li>
247+
<a href="#pub.sandbox.v1alpha1.Mode"><span class="badge">E</span>Mode</a>
248+
</li>
249+
242250
<li>
243251
<a href="#pub.sandbox.v1alpha1.SandboxState"><span class="badge">E</span>SandboxState</a>
244252
</li>
@@ -323,6 +331,27 @@ <h3 id="pub.sandbox.v1alpha1.CreateSandboxRequest">CreateSandboxRequest</h3>
323331
<td><p>Optional. Project must belong to organization. </p></td>
324332
</tr>
325333

334+
<tr>
335+
<td>machine_type</td>
336+
<td><a href="#pub.sandbox.v1alpha1.MachineType">MachineType</a></td>
337+
<td></td>
338+
<td><p>Optional. The machine type to use for the sandbox. Defaults to MACHINE_TYPE_4CPU_16MEM. </p></td>
339+
</tr>
340+
341+
<tr>
342+
<td>github_token</td>
343+
<td><a href="#string">string</a></td>
344+
<td></td>
345+
<td><p> </p></td>
346+
</tr>
347+
348+
<tr>
349+
<td>mode</td>
350+
<td><a href="#pub.sandbox.v1alpha1.Mode">Mode</a></td>
351+
<td></td>
352+
<td><p> </p></td>
353+
</tr>
354+
326355
</tbody>
327356
</table>
328357

@@ -524,7 +553,8 @@ <h3 id="pub.sandbox.v1alpha1.ListSandboxesRequest">ListSandboxesRequest</h3>
524553
<td>fetch_status_and_url</td>
525554
<td><a href="#bool">bool</a></td>
526555
<td></td>
527-
<td><p> </p></td>
556+
<td><p>fetch_status_and_url could be renamed to `fetch_workstation` to populate fields dependent
557+
on the cloud resource (i.e. Cloud Workstation) </p></td>
528558
</tr>
529559

530560
<tr>
@@ -593,7 +623,7 @@ <h3 id="pub.sandbox.v1alpha1.Sandbox">Sandbox</h3>
593623
<td>repo</td>
594624
<td><a href="#string">string</a></td>
595625
<td></td>
596-
<td><p> </p></td>
626+
<td><p>repo is the github repository that is cloned. This may be user owned, or the template repo. </p></td>
597627
</tr>
598628

599629
<tr>
@@ -659,6 +689,28 @@ <h3 id="pub.sandbox.v1alpha1.Sandbox">Sandbox</h3>
659689
<td><p>Optional. For sandboxes created with a project_id. </p></td>
660690
</tr>
661691

692+
<tr>
693+
<td>is_trial</td>
694+
<td><a href="#bool">bool</a></td>
695+
<td></td>
696+
<td><p>True if the sandbox is a trial sandbox. Trial sandboxes are deleted after 14 days and
697+
have other restrictions. </p></td>
698+
</tr>
699+
700+
<tr>
701+
<td>mode</td>
702+
<td><a href="#pub.sandbox.v1alpha1.Mode">Mode</a></td>
703+
<td></td>
704+
<td><p> </p></td>
705+
</tr>
706+
707+
<tr>
708+
<td>has_gpu</td>
709+
<td><a href="#bool">bool</a></td>
710+
<td></td>
711+
<td><p> </p></td>
712+
</tr>
713+
662714
</tbody>
663715
</table>
664716

@@ -771,6 +823,74 @@ <h3 id="pub.sandbox.v1alpha1.StopSandboxResponse">StopSandboxResponse</h3>
771823

772824

773825

826+
<h3 id="pub.sandbox.v1alpha1.MachineType">MachineType</h3>
827+
<p></p>
828+
<table class="enum-table">
829+
<thead>
830+
<tr><td>Name</td><td>Number</td><td>Description</td></tr>
831+
</thead>
832+
<tbody>
833+
834+
<tr>
835+
<td>MACHINE_TYPE_UNSPECIFIED</td>
836+
<td>0</td>
837+
<td><p>Do not use.</p></td>
838+
</tr>
839+
840+
<tr>
841+
<td>MACHINE_TYPE_2CPU_8MEM</td>
842+
<td>1</td>
843+
<td><p></p></td>
844+
</tr>
845+
846+
<tr>
847+
<td>MACHINE_TYPE_4CPU_16MEM</td>
848+
<td>2</td>
849+
<td><p></p></td>
850+
</tr>
851+
852+
<tr>
853+
<td>MACHINE_TYPE_4CPU_15MEM_1T4</td>
854+
<td>3</td>
855+
<td><p></p></td>
856+
</tr>
857+
858+
</tbody>
859+
</table>
860+
861+
<h3 id="pub.sandbox.v1alpha1.Mode">Mode</h3>
862+
<p></p>
863+
<table class="enum-table">
864+
<thead>
865+
<tr><td>Name</td><td>Number</td><td>Description</td></tr>
866+
</thead>
867+
<tbody>
868+
869+
<tr>
870+
<td>MODE_UNSPECIFIED</td>
871+
<td>0</td>
872+
<td><p></p></td>
873+
</tr>
874+
875+
<tr>
876+
<td>MODE_GIT_REPO</td>
877+
<td>1</td>
878+
<td><p>MODE_GIT_REPO sets up a sandbox with the provided git repo (at specified `ref`),
879+
and the working directory set to the `subdir` in the repo.</p></td>
880+
</tr>
881+
882+
<tr>
883+
<td>MODE_TEMPLATE</td>
884+
<td>2</td>
885+
<td><p>MODE_TEMPLATE sets up a sandbox to use a template. The code from the
886+
git repo (at specified `ref`) is checked out and the root of the sandbox
887+
code folder is set to the `subdir` in the repo. The original git repo is
888+
discarded. A new git repo is initialized.</p></td>
889+
</tr>
890+
891+
</tbody>
892+
</table>
893+
774894
<h3 id="pub.sandbox.v1alpha1.SandboxState">SandboxState</h3>
775895
<p>SandboxState represents the state of a sandbox.</p>
776896
<table class="enum-table">

‎api/docs/markdown/pub/sandbox/v1alpha1/index.md

+37-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
- [StopSandboxRequest](#pub-sandbox-v1alpha1-StopSandboxRequest)
2121
- [StopSandboxResponse](#pub-sandbox-v1alpha1-StopSandboxResponse)
2222

23+
- [MachineType](#pub-sandbox-v1alpha1-MachineType)
24+
- [Mode](#pub-sandbox-v1alpha1-Mode)
2325
- [SandboxState](#pub-sandbox-v1alpha1-SandboxState)
2426

2527
- [SandboxService](#pub-sandbox-v1alpha1-SandboxService)
@@ -50,6 +52,9 @@ API to manage Jetify Sandbox environments
5052
| environment_variables | [CreateSandboxRequest.EnvironmentVariablesEntry](#pub-sandbox-v1alpha1-CreateSandboxRequest-EnvironmentVariablesEntry) | repeated | |
5153
| name | [string](#string) | | Optional, human readable name for the sandbox. |
5254
| project_id | [string](#string) | | Optional. Project must belong to organization. |
55+
| machine_type | [MachineType](#pub-sandbox-v1alpha1-MachineType) | | Optional. The machine type to use for the sandbox. Defaults to MACHINE_TYPE_4CPU_16MEM. |
56+
| github_token | [string](#string) | | |
57+
| mode | [Mode](#pub-sandbox-v1alpha1-Mode) | | |
5358

5459

5560

@@ -168,7 +173,7 @@ API to manage Jetify Sandbox environments
168173

169174
| Field | Type | Label | Description |
170175
| ----- | ---- | ----- | ----------- |
171-
| fetch_status_and_url | [bool](#bool) | | |
176+
| fetch_status_and_url | [bool](#bool) | | fetch_status_and_url could be renamed to `fetch_workstation` to populate fields dependent on the cloud resource (i.e. Cloud Workstation) |
172177
| filter | [ListSandboxesFilter](#pub-sandbox-v1alpha1-ListSandboxesFilter) | | |
173178

174179

@@ -201,7 +206,7 @@ API to manage Jetify Sandbox environments
201206
| ----- | ---- | ----- | ----------- |
202207
| id | [string](#string) | | |
203208
| external_billing_tag | [string](#string) | | |
204-
| repo | [string](#string) | | |
209+
| repo | [string](#string) | | repo is the github repository that is cloned. This may be user owned, or the template repo. |
205210
| subdir | [string](#string) | | The subdirectory within the repo to checkout. Defaults to the root of the repo. |
206211
| ref | [string](#string) | | The git ref to checkout. This can be a branch, tag, or commit hash. Defaults to the default branch. |
207212
| url | [string](#string) | | Will be empty if the sandbox is not running. If present, it will contain access token. |
@@ -211,6 +216,9 @@ API to manage Jetify Sandbox environments
211216
| updated_at | [google.protobuf.Timestamp](#google-protobuf-Timestamp) | | The time the sandbox was last updated. |
212217
| name | [string](#string) | | |
213218
| project_id | [string](#string) | | Optional. For sandboxes created with a project_id. |
219+
| is_trial | [bool](#bool) | | True if the sandbox is a trial sandbox. Trial sandboxes are deleted after 14 days and have other restrictions. |
220+
| mode | [Mode](#pub-sandbox-v1alpha1-Mode) | | |
221+
| has_gpu | [bool](#bool) | | |
214222

215223

216224

@@ -280,6 +288,33 @@ API to manage Jetify Sandbox environments
280288

281289

282290

291+
<a name="pub-sandbox-v1alpha1-MachineType"></a>
292+
293+
### MachineType
294+
295+
296+
| Name | Number | Description |
297+
| ---- | ------ | ----------- |
298+
| MACHINE_TYPE_UNSPECIFIED | 0 | Do not use. |
299+
| MACHINE_TYPE_2CPU_8MEM | 1 | |
300+
| MACHINE_TYPE_4CPU_16MEM | 2 | |
301+
| MACHINE_TYPE_4CPU_15MEM_1T4 | 3 | |
302+
303+
304+
305+
<a name="pub-sandbox-v1alpha1-Mode"></a>
306+
307+
### Mode
308+
309+
310+
| Name | Number | Description |
311+
| ---- | ------ | ----------- |
312+
| MODE_UNSPECIFIED | 0 | |
313+
| MODE_GIT_REPO | 1 | MODE_GIT_REPO sets up a sandbox with the provided git repo (at specified `ref`), and the working directory set to the `subdir` in the repo. |
314+
| MODE_TEMPLATE | 2 | MODE_TEMPLATE sets up a sandbox to use a template. The code from the git repo (at specified `ref`) is checked out and the root of the sandbox code folder is set to the `subdir` in the repo. The original git repo is discarded. A new git repo is initialized. |
315+
316+
317+
283318
<a name="pub-sandbox-v1alpha1-SandboxState"></a>
284319

285320
### SandboxState

0 commit comments

Comments
 (0)