github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat: add support for specifying multiple networks on a given app

Browse Source 
Closes #5314
This commit is contained in:
Jose Diaz-Gonzalez
2023-05-28 21:21:26 -04:00
parent 40b20e0c08
commit 60b343470b
7 changed files with 104 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
plugins/network/subcommands.go
View File

@@ -141,7 +141,7 @@ func CommandReport(appName string, format string, infoFlag string) error {
}
// CommandSet set or clear a network property for an app
func CommandSet(appName string, property string, value string) error {
func CommandSet(appName string, property string, value string, values []string) error {
if appName != "--global" {
if err := common.VerifyAppName(appName); err != nil {
return err
@@ -152,7 +152,7 @@ func CommandSet(appName string, property string, value string) error {
value = "false"
}
attachProperites := map[string]bool{
attachProperties := map[string]bool{
"attach-post-create": true,
"attach-post-deploy": true,
}
@@ -161,14 +161,17 @@ func CommandSet(appName string, property string, value string) error {
"host": true,
"bridge": true,
}
if attachProperites[property] {
if invalidNetworks[value] {
return errors.New("Invalid network name specified for attach")
}
if attachProperties[property] {
for _, networkName := range values {
if invalidNetworks[networkName] {
return fmt.Errorf("Invalid network name specified for attach: %s", networkName)
}
if isConflictingPropertyValue(appName, property, value) {
return errors.New("Network name already associated with this app")
if isConflictingPropertyValue(appName, property, networkName) {
return fmt.Errorf("Network name already associated with this app: %s", networkName)
}
}
value = strings.Join(values, ",")
}
common.CommandPropertySet("network", appName, property, value, DefaultProperties, GlobalProperties)