-
Notifications
You must be signed in to change notification settings - Fork 135
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
* PMM-4879 Added defaults file. * PMM-4879 Added AgentMessage and ServerMessage: ParseDefaultsFiile. * PMM-4879 Updating agent.go with ParseDefaultsFile request/responses. * PMM-4879 Updating agents ParseDefaultsFileRequest with ServiceType field. * PMM-4879 Error field in ParseDefaultsFileResponse. * PMM-4879 Regenerate files after go update to 1.18. * PMM-4879 Adding new fields to agent response ParseDefaultsFile. * PMM-4879 Removing username validation and adding socket to ParseDefaultsFileResponse * PMM-4879 Added support for defaultsfile parameter (pmm-admin). * PMM-4879 Added support for defaultsfile parameter (pmm-agent). Co-authored-by: Alexey Mukas <[email protected]>
- Loading branch information
Showing
22 changed files
with
1,549 additions
and
932 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| // pmm-agent | ||
| // Copyright 2019 Percona LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // Package defaultsfile provides managing of defaults file. | ||
| package defaultsfile | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "os/user" | ||
| "path/filepath" | ||
| "strings" | ||
|
|
||
| "github.com/pkg/errors" | ||
| "gopkg.in/ini.v1" | ||
|
|
||
| "github.com/percona/pmm/api/agentpb" | ||
| "github.com/percona/pmm/api/inventorypb" | ||
| ) | ||
|
|
||
| // Parser is a struct which is responsible for parsing defaults file. | ||
| type Parser struct{} | ||
|
|
||
| // New creates new DefaultsFileParser. | ||
| func New() *Parser { | ||
| return &Parser{} | ||
| } | ||
|
|
||
| type defaultsFile struct { | ||
| username string | ||
| password string | ||
| host string | ||
| port uint32 | ||
| socket string | ||
| } | ||
|
|
||
| // ParseDefaultsFile parses given defaultsFile in request. It returns the database specs. | ||
| func (d *Parser) ParseDefaultsFile(req *agentpb.ParseDefaultsFileRequest) *agentpb.ParseDefaultsFileResponse { | ||
| var res agentpb.ParseDefaultsFileResponse | ||
| defaultsFile, err := parseDefaultsFile(req.ConfigPath, req.ServiceType) | ||
| if err != nil { | ||
| res.Error = err.Error() | ||
| return &res | ||
| } | ||
|
|
||
| res.Username = defaultsFile.username | ||
| res.Password = defaultsFile.password | ||
| res.Host = defaultsFile.host | ||
| res.Port = defaultsFile.port | ||
| res.Socket = defaultsFile.socket | ||
|
|
||
| return &res | ||
| } | ||
|
|
||
| func parseDefaultsFile(configPath string, serviceType inventorypb.ServiceType) (*defaultsFile, error) { | ||
| if len(configPath) == 0 { | ||
| return nil, errors.New("configPath for DefaultsFile is empty") | ||
| } | ||
|
|
||
| switch serviceType { | ||
| case inventorypb.ServiceType_MYSQL_SERVICE: | ||
| return parseMySQLDefaultsFile(configPath) | ||
| case inventorypb.ServiceType_EXTERNAL_SERVICE: | ||
| case inventorypb.ServiceType_HAPROXY_SERVICE: | ||
| case inventorypb.ServiceType_MONGODB_SERVICE: | ||
| case inventorypb.ServiceType_POSTGRESQL_SERVICE: | ||
| case inventorypb.ServiceType_PROXYSQL_SERVICE: | ||
| case inventorypb.ServiceType_SERVICE_TYPE_INVALID: | ||
| return nil, errors.Errorf("unimplemented service type %s", serviceType) | ||
| } | ||
|
|
||
| return nil, errors.Errorf("unimplemented service type %s", serviceType) | ||
| } | ||
|
|
||
| func parseMySQLDefaultsFile(configPath string) (*defaultsFile, error) { | ||
| configPath, err := expandPath(configPath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("fail to normalize path: %w", err) | ||
| } | ||
|
|
||
| cfg, err := ini.Load(configPath) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("fail to read config file: %w", err) | ||
| } | ||
|
|
||
| cfgSection := cfg.Section("client") | ||
| port, _ := cfgSection.Key("port").Uint() | ||
|
|
||
| parsedData := &defaultsFile{ | ||
| username: cfgSection.Key("user").String(), | ||
| password: cfgSection.Key("password").String(), | ||
| host: cfgSection.Key("host").String(), | ||
| port: uint32(port), | ||
| socket: cfgSection.Key("socket").String(), | ||
| } | ||
|
|
||
| err = validateDefaultsFileResults(parsedData) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return parsedData, nil | ||
| } | ||
|
|
||
| func validateDefaultsFileResults(data *defaultsFile) error { | ||
| if data.username == "" && data.password == "" && data.host == "" && data.port == 0 && data.socket == "" { | ||
| return errors.New("no data found in defaults file") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func expandPath(path string) (string, error) { | ||
| if strings.HasPrefix(path, "~/") { | ||
| usr, err := user.Current() | ||
| if err != nil { | ||
| return "", fmt.Errorf("failed to expand path: %w", err) | ||
| } | ||
| return filepath.Join(usr.HomeDir, path[2:]), nil | ||
| } | ||
| return path, nil | ||
| } |
Oops, something went wrong.