Skip to content

agent: drop atlas/scada code #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 10, 2017
Merged

agent: drop atlas/scada code #3032

merged 1 commit into from
May 10, 2017

Conversation

magiconair
Copy link
Contributor

No description provided.

@magiconair magiconair requested a review from slackpad May 10, 2017 16:34
Copy link
Contributor

@slackpad slackpad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Two tiny things, otherwise LGTM.

DeprecatedAtlasInfrastructure string `mapstructure:"atlas_infrastructure"`
DeprecatedAtlasToken string `mapstructure:"atlas_token" json:"-"`
DeprecatedAtlasACLToken string `mapstructure:"atlas_acl_token" json:"-"`
DeprecatedAtlasJoin bool `mapstructure:"atlas_join"`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if you json:"-" these as well they won't show up in /v1/agent/self

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

if err := c.Command.Parse(c.args); err != nil {
return nil
}

// check deprecated flags
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will these basically be duplicate warnings with the others you have below?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no since the ones will be for the HTTP endpoint and the other ones for the command line. I'll add the ==> prefix though.

Copy link
Contributor

@slackpad slackpad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@magiconair magiconair merged commit 6eba69f into master May 10, 2017
@magiconair magiconair deleted the fms-drop-scada branch May 10, 2017 21:06
@magiconair magiconair self-assigned this May 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants