resource/opsworks_layers: Removed deprecated normalizeJson function #3081
Conversation
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
Ninir
added
enhancement
Ninir
force-pushed
the
f-clean-deprecated-function
branch
from
49093d6
to
5f70fc8
Compare
radeksimko
approved these changes
Jan 22, 2018
aws/opsworks_layers.go
Outdated
| } else { | ||
| policy, err := structure.NormalizeJsonString(*v) | ||
| if err != nil { | ||
| return errwrap.Wrapf("policy contains an invalid JSON: {{err}}", err) |
There was a problem hiding this comment.
Nitpick: As this error is going to be raised straight to the user I don't see the point in using errwrap here.
There was a problem hiding this comment.
Updated, thanks for the explanation btw!
aws/opsworks_layers.go
Outdated
| if v == nil { | ||
| d.Set("custom_json", "") | ||
| } else { | ||
| policy, err := structure.NormalizeJsonString(*v) |
There was a problem hiding this comment.
Nitpick: The short variable name v was ok-ish when it was in the previously short context, but I think we should now just reference layer.CustomJson in all 3 places for clarity.
Ninir
force-pushed
the
f-clean-deprecated-function
branch
from
5f70fc8
to
1dbd8c5
Compare
Ninir
force-pushed
the
f-clean-deprecated-function
branch
from
1dbd8c5
to
d576f3c
Compare
|
I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues. If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks! |
ghost
locked and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This is the continuation of #2935.
It removes the deprecated
normalizeJsonfunction usage inopsworks_layers.go, removing the function definition inresource_aws_s3_bucket.go.This also fixes the following failing test:
Tests