Make env argument more generic

[erickhun]

Instead of checking the environment , we should check wether it's an aws config or not

[amalkh5]

@erickhun
could you explain more the issue?