Skip to content

Commit 5cd3965

Browse files
bufdevbufdev
authored
Delete PLUGIN_REGISTRY_TYPE_ARCHIVE (#2849)
1 parent 7191b30 commit 5cd3965

6 files changed

Lines changed: 569 additions & 712 deletions

File tree

‎private/bufpkg/bufplugin/bufplugin.go‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,6 @@ func PluginToProtoPluginRegistryType(plugin Plugin) registryv1alpha1.PluginRegis
7878
registryType = registryv1alpha1.PluginRegistryType_PLUGIN_REGISTRY_TYPE_SWIFT
7979
} else if plugin.Registry().Python != nil {
8080
registryType = registryv1alpha1.PluginRegistryType_PLUGIN_REGISTRY_TYPE_PYTHON
81-
} else if plugin.Registry().Archive != nil {
82-
registryType = registryv1alpha1.PluginRegistryType_PLUGIN_REGISTRY_TYPE_ARCHIVE
8381
}
8482
}
8583
return registryType
@@ -197,12 +195,6 @@ func PluginRegistryToProtoRegistryConfig(pluginRegistry *bufpluginconfig.Registr
197195
return nil, err
198196
}
199197
registryConfig.RegistryConfig = &registryv1alpha1.RegistryConfig_PythonConfig{PythonConfig: pythonConfig}
200-
} else if pluginRegistry.Archive != nil {
201-
archiveConfig, err := ArchiveRegistryConfigToProtoArchiveConfig(pluginRegistry.Archive)
202-
if err != nil {
203-
return nil, err
204-
}
205-
registryConfig.RegistryConfig = &registryv1alpha1.RegistryConfig_ArchiveConfig{ArchiveConfig: archiveConfig}
206198
}
207199
return registryConfig, nil
208200
}
@@ -272,12 +264,6 @@ func ProtoRegistryConfigToPluginRegistry(config *registryv1alpha1.RegistryConfig
272264
return nil, err
273265
}
274266
registryConfig.Python = pythonConfig
275-
} else if protoArchiveConfig := config.GetArchiveConfig(); protoArchiveConfig != nil {
276-
archiveConfig, err := ProtoArchiveConfigToArchiveRegistryConfig(protoArchiveConfig)
277-
if err != nil {
278-
return nil, err
279-
}
280-
registryConfig.Archive = archiveConfig
281267
}
282268
return registryConfig, nil
283269
}
@@ -320,14 +306,6 @@ func PythonRegistryConfigToProtoPythonConfig(pythonConfig *bufpluginconfig.Pytho
320306
return protoPythonConfig, nil
321307
}
322308

323-
func ProtoArchiveConfigToArchiveRegistryConfig(protoArchiveConfig *registryv1alpha1.ArchiveConfig) (*bufpluginconfig.ArchiveRegistryConfig, error) {
324-
return &bufpluginconfig.ArchiveRegistryConfig{}, nil
325-
}
326-
327-
func ArchiveRegistryConfigToProtoArchiveConfig(archiveConfig *bufpluginconfig.ArchiveRegistryConfig) (*registryv1alpha1.ArchiveConfig, error) {
328-
return &registryv1alpha1.ArchiveConfig{}, nil
329-
}
330-
331309
func ProtoSwiftConfigToSwiftRegistryConfig(protoSwiftConfig *registryv1alpha1.SwiftConfig) (*bufpluginconfig.SwiftRegistryConfig, error) {
332310
swiftConfig := &bufpluginconfig.SwiftRegistryConfig{}
333311
runtimeLibs := protoSwiftConfig.GetRuntimeLibraries()

‎private/bufpkg/bufplugin/bufpluginconfig/bufpluginconfig.go‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,11 @@ type Config struct {
8787
//
8888
// Only one field will be set.
8989
type RegistryConfig struct {
90-
Go *GoRegistryConfig
91-
NPM *NPMRegistryConfig
92-
Maven *MavenRegistryConfig
93-
Swift *SwiftRegistryConfig
94-
Python *PythonRegistryConfig
95-
Archive *ArchiveRegistryConfig
90+
Go *GoRegistryConfig
91+
NPM *NPMRegistryConfig
92+
Maven *MavenRegistryConfig
93+
Swift *SwiftRegistryConfig
94+
Python *PythonRegistryConfig
9695
// Options is the set of options passed into the plugin for the
9796
// remote registry.
9897
//
@@ -242,8 +241,6 @@ type PythonRegistryConfig struct {
242241
PackageType string
243242
}
244243

245-
type ArchiveRegistryConfig struct{}
246-
247244
// ConfigOption is an optional option used when loading a Config.
248245
type ConfigOption func(*configOptions)
249246

@@ -369,13 +366,12 @@ type ExternalDependency struct {
369366
// ExternalRegistryConfig is the external configuration for the registry
370367
// of a plugin.
371368
type ExternalRegistryConfig struct {
372-
Go *ExternalGoRegistryConfig `json:"go,omitempty" yaml:"go,omitempty"`
373-
NPM *ExternalNPMRegistryConfig `json:"npm,omitempty" yaml:"npm,omitempty"`
374-
Maven *ExternalMavenRegistryConfig `json:"maven,omitempty" yaml:"maven,omitempty"`
375-
Swift *ExternalSwiftRegistryConfig `json:"swift,omitempty" yaml:"swift,omitempty"`
376-
Python *ExternalPythonRegistryConfig `json:"python,omitempty" yaml:"python,omitempty"`
377-
Archive *ExternalArchiveRegistryConfig `json:"archive,omitempty" yaml:"archive,omitempty"`
378-
Opts []string `json:"opts,omitempty" yaml:"opts,omitempty"`
369+
Go *ExternalGoRegistryConfig `json:"go,omitempty" yaml:"go,omitempty"`
370+
NPM *ExternalNPMRegistryConfig `json:"npm,omitempty" yaml:"npm,omitempty"`
371+
Maven *ExternalMavenRegistryConfig `json:"maven,omitempty" yaml:"maven,omitempty"`
372+
Swift *ExternalSwiftRegistryConfig `json:"swift,omitempty" yaml:"swift,omitempty"`
373+
Python *ExternalPythonRegistryConfig `json:"python,omitempty" yaml:"python,omitempty"`
374+
Opts []string `json:"opts,omitempty" yaml:"opts,omitempty"`
379375
}
380376

381377
// ExternalGoRegistryConfig is the external registry configuration for a Go plugin.
@@ -493,8 +489,6 @@ type ExternalPythonRegistryConfig struct {
493489
PackageType string `json:"package_type,omitempty" yaml:"package_type,omitempty"`
494490
}
495491

496-
type ExternalArchiveRegistryConfig struct{}
497-
498492
type externalConfigVersion struct {
499493
Version string `json:"version,omitempty" yaml:"version,omitempty"`
500494
}

‎private/bufpkg/bufplugin/bufpluginconfig/bufpluginconfig_test.go‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -328,29 +328,6 @@ func TestParsePluginConfigPythonYAML(t *testing.T) {
328328
)
329329
}
330330

331-
func TestParsePluginConfigArchiveYAML(t *testing.T) {
332-
t.Parallel()
333-
pluginConfig, err := ParseConfig(filepath.Join("testdata", "success", "archive", "buf.plugin.yaml"))
334-
require.NoError(t, err)
335-
pluginIdentity, err := bufpluginref.PluginIdentityForString("buf.build/community/pseudomuto-doc")
336-
require.NoError(t, err)
337-
require.Equal(
338-
t,
339-
&Config{
340-
Name: pluginIdentity,
341-
PluginVersion: "v1.5.1",
342-
SourceURL: "https://github.com/pseudomuto/protoc-gen-doc",
343-
Description: "Documentation generator plugin for Google Protocol Buffers.",
344-
SPDXLicenseID: "MIT",
345-
LicenseURL: "https://github.com/pseudomuto/protoc-gen-doc/blob/v1.5.1/LICENSE.md",
346-
Registry: &RegistryConfig{
347-
Archive: &ArchiveRegistryConfig{},
348-
},
349-
},
350-
pluginConfig,
351-
)
352-
}
353-
354331
func TestParsePluginConfigOptionsYAML(t *testing.T) {
355332
t.Parallel()
356333
pluginConfig, err := ParseConfig(filepath.Join("testdata", "success", "options", "buf.plugin.yaml"))

‎private/bufpkg/bufplugin/bufpluginconfig/config.go‎

Lines changed: 5 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,11 @@ func newConfig(externalConfig ExternalConfig, options []ConfigOption) (*Config,
8787

8888
func newRegistryConfig(externalRegistryConfig ExternalRegistryConfig) (*RegistryConfig, error) {
8989
var (
90-
isGoEmpty = externalRegistryConfig.Go == nil
91-
isNPMEmpty = externalRegistryConfig.NPM == nil
92-
isMavenEmpty = externalRegistryConfig.Maven == nil
93-
isSwiftEmpty = externalRegistryConfig.Swift == nil
94-
isPythonEmpty = externalRegistryConfig.Python == nil
95-
isArchiveEmpty = externalRegistryConfig.Archive == nil
90+
isGoEmpty = externalRegistryConfig.Go == nil
91+
isNPMEmpty = externalRegistryConfig.NPM == nil
92+
isMavenEmpty = externalRegistryConfig.Maven == nil
93+
isSwiftEmpty = externalRegistryConfig.Swift == nil
94+
isPythonEmpty = externalRegistryConfig.Python == nil
9695
)
9796
var registryCount int
9897
for _, isEmpty := range []bool{
@@ -101,7 +100,6 @@ func newRegistryConfig(externalRegistryConfig ExternalRegistryConfig) (*Registry
101100
isMavenEmpty,
102101
isSwiftEmpty,
103102
isPythonEmpty,
104-
isArchiveEmpty,
105103
} {
106104
if !isEmpty {
107105
registryCount++
@@ -163,15 +161,6 @@ func newRegistryConfig(externalRegistryConfig ExternalRegistryConfig) (*Registry
163161
Python: pythonRegistryConfig,
164162
Options: options,
165163
}, nil
166-
case !isArchiveEmpty:
167-
archiveRegistryConfig, err := newArchiveRegistryConfig(externalRegistryConfig.Archive)
168-
if err != nil {
169-
return nil, err
170-
}
171-
return &RegistryConfig{
172-
Archive: archiveRegistryConfig,
173-
Options: options,
174-
}, nil
175164
default:
176165
return nil, errors.New("unknown registry configuration")
177166
}
@@ -368,10 +357,6 @@ func newPythonRegistryConfig(externalPythonRegistryConfig *ExternalPythonRegistr
368357
}, nil
369358
}
370359

371-
func newArchiveRegistryConfig(externalArchiveRegistryConfig *ExternalArchiveRegistryConfig) (*ArchiveRegistryConfig, error) {
372-
return &ArchiveRegistryConfig{}, nil
373-
}
374-
375360
func pluginIdentityForStringWithOverrideRemote(identityStr string, overrideRemote string) (bufpluginref.PluginIdentity, error) {
376361
identity, err := bufpluginref.PluginIdentityForString(identityStr)
377362
if err != nil {

0 commit comments

Comments
 (0)