Skip to content

Commit c0ddec8

Browse files
yardenshohamyardenshoham
authored
Revert "Add Debian package registry" (#24412)
Reverts #22854
1 parent bf77e21 commit c0ddec8

File tree

57 files changed

+96
-1995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+96
-1995
lines changed

‎assets/go-licenses.json

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cmd/migrate_storage_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestMigratePackages(t *testing.T) {
2525
creator := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 1})
2626

2727
content := "package main\n\nfunc main() {\nfmt.Println(\"hi\")\n}\n"
28-
buf, err := packages_module.CreateHashedBufferFromReaderWithSize(strings.NewReader(content), 1024)
28+
buf, err := packages_module.CreateHashedBufferFromReader(strings.NewReader(content), 1024)
2929
assert.NoError(t, err)
3030
defer buf.Close()
3131

‎custom/conf/app.example.ini

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2501,8 +2501,6 @@ ROUTER = console
25012501
;LIMIT_SIZE_CONDA = -1
25022502
;; Maximum size of a Container upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
25032503
;LIMIT_SIZE_CONTAINER = -1
2504-
;; Maximum size of a Debian upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
2505-
;LIMIT_SIZE_DEBIAN = -1
25062504
;; Maximum size of a Generic upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
25072505
;LIMIT_SIZE_GENERIC = -1
25082506
;; Maximum size of a Helm upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)

‎docs/content/doc/administration/config-cheat-sheet.en-us.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,6 @@ Task queue configuration has been moved to `queue.task`. However, the below conf
12521252
- `LIMIT_SIZE_CONAN`: **-1**: Maximum size of a Conan upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12531253
- `LIMIT_SIZE_CONDA`: **-1**: Maximum size of a Conda upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12541254
- `LIMIT_SIZE_CONTAINER`: **-1**: Maximum size of a Container upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
1255-
- `LIMIT_SIZE_DEBIAN`: **-1**: Maximum size of a Debian upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12561255
- `LIMIT_SIZE_GENERIC`: **-1**: Maximum size of a Generic upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12571256
- `LIMIT_SIZE_HELM`: **-1**: Maximum size of a Helm upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)
12581257
- `LIMIT_SIZE_MAVEN`: **-1**: Maximum size of a Maven upload (`-1` means no limits, format `1000`, `1 MB`, `1 GiB`)

‎docs/content/doc/usage/packages/debian.en-us.md

Lines changed: 0 additions & 134 deletions
This file was deleted.

‎docs/content/doc/usage/packages/overview.en-us.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ The following package managers are currently supported:
3333
| [Conan]({{< relref "doc/usage/packages/conan.en-us.md" >}}) | C++ | `conan` |
3434
| [Conda]({{< relref "doc/usage/packages/conda.en-us.md" >}}) | - | `conda` |
3535
| [Container]({{< relref "doc/usage/packages/container.en-us.md" >}}) | - | any OCI compliant client |
36-
| [Debian]({{< relref "doc/usage/packages/debian.en-us.md" >}}) | - | `apt` |
3736
| [Generic]({{< relref "doc/usage/packages/generic.en-us.md" >}}) | - | any HTTP client |
3837
| [Helm]({{< relref "doc/usage/packages/helm.en-us.md" >}}) | - | any HTTP client, `cm-push` |
3938
| [Maven]({{< relref "doc/usage/packages/maven.en-us.md" >}}) | Java | `mvn`, `gradle` |

‎go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ require (
1717
github.com/NYTimes/gziphandler v1.1.1
1818
github.com/PuerkitoBio/goquery v1.8.0
1919
github.com/alecthomas/chroma/v2 v2.5.0
20-
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb
2120
github.com/blevesearch/bleve/v2 v2.3.6
2221
github.com/bufbuild/connect-go v1.3.1
2322
github.com/buildkite/terminal-to-html/v3 v3.7.0
@@ -97,7 +96,6 @@ require (
9796
github.com/stretchr/testify v1.8.1
9897
github.com/syndtr/goleveldb v1.0.0
9998
github.com/tstranex/u2f v1.0.0
100-
github.com/ulikunitz/xz v0.5.11
10199
github.com/urfave/cli v1.22.12
102100
github.com/xanzy/go-gitlab v0.80.2
103101
github.com/xeipuuv/gojsonschema v1.2.0
@@ -262,6 +260,7 @@ require (
262260
github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
263261
github.com/subosito/gotenv v1.4.1 // indirect
264262
github.com/toqueteos/webbrowser v1.2.0 // indirect
263+
github.com/ulikunitz/xz v0.5.11 // indirect
265264
github.com/unknwon/com v1.0.1 // indirect
266265
github.com/valyala/bytebufferpool v1.0.0 // indirect
267266
github.com/valyala/fasthttp v1.44.0 // indirect

‎go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@ github.com/bits-and-blooms/bitset v1.1.10/go.mod h1:w0XsmFg8qg6cmpTtJ0z3pKgjTDBM
162162
github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
163163
github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8=
164164
github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
165-
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb h1:m935MPodAbYS46DG4pJSv7WO+VECIWUQ7OJYSoTrMh4=
166-
github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAwrSvRx5DYA+gUcOIgTGVMNkfSCbZM8cWpI=
167165
github.com/blevesearch/bleve/v2 v2.0.5/go.mod h1:ZjWibgnbRX33c+vBRgla9QhPb4QOjD6fdVJ+R1Bk8LM=
168166
github.com/blevesearch/bleve/v2 v2.3.6 h1:NlntUHcV5CSWIhpugx4d/BRMGCiaoI8ZZXrXlahzNq4=
169167
github.com/blevesearch/bleve/v2 v2.3.6/go.mod h1:JM2legf1cKVkdV8Ehu7msKIOKC0McSw0Q16Fmv9vsW4=

‎models/migrations/migrations.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -489,8 +489,6 @@ var migrations = []Migration{
489489
NewMigration("Add ActionTaskOutput table", v1_20.AddActionTaskOutputTable),
490490
// v255 -> v256
491491
NewMigration("Add ArchivedUnix Column", v1_20.AddArchivedUnixToRepository),
492-
// v256 -> v257
493-
NewMigration("Add is_internal column to package", v1_20.AddIsInternalColumnToPackage),
494492
}
495493

496494
// GetCurrentDBVersion returns the current db version

‎models/migrations/v1_20/v256.go

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎models/packages/container/search.go

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,16 @@ func getContainerBlobsLimit(ctx context.Context, opts *BlobSearchOptions, limit
101101
return nil, err
102102
}
103103

104-
return packages.GetPackageFileDescriptors(ctx, pfs)
104+
pfds := make([]*packages.PackageFileDescriptor, 0, len(pfs))
105+
for _, pf := range pfs {
106+
pfd, err := packages.GetPackageFileDescriptor(ctx, pf)
107+
if err != nil {
108+
return nil, err
109+
}
110+
pfds = append(pfds, pfd)
111+
}
112+
113+
return pfds, nil
105114
}
106115

107116
// GetManifestVersions gets all package versions representing the matching manifest

‎models/packages/debian/search.go

Lines changed: 0 additions & 131 deletions
This file was deleted.

0 commit comments

Comments
 (0)