Add missing S3 module import

[MasterNayru]

In the get_url method in fileclient.py, a salt.utils.s3.query method call is made, but this won't work unless the salt.utils.s3 module is imported first. This missing line breaks file.managed resources where source and source_hash attributes use s3:// style URLs.

[cachedout]

Thanks, @MasterNayru

[MasterNayru]

@cachedout Is there anything I should do to get this line added into the 2015.5 and 2015.8 branches as well? As far as I can tell, this is broken in these two versions of Salt as well.

[cachedout]

@MasterNayru I'm sort of surprised this has been broken as far back as 2015.5 without an issue being filed. Do you have an issue that this is linked to? We can definietely backport it. I'm just curious.

[MasterNayru]

@cachedout I'm pretty surprised as well as I don't see how any use of salt.utils.s3.query would work without importing the salt.utils.s3 module in that file first, and I don't see that import present in fileclient.py in the 2014.7, 2015.5 or 2015.8 branches.

As far as existing issues go, I haven't seen any direct reference to this bug from my quick search.

[cachedout]

@MasterNayru K, sounds good. We can just mark this one for backporting, but that's certainly curious. At any rate, thanks for your good detective work here. Much appreciated.

[cachedout]

This is causing a circular import and some serious breakage. I am going to revert this. We need to find a better way to handle this.

bpython version 0.14.2 on top of Python 2.7.10 /usr/bin/python2
>>> import salt.utils
Traceback (most recent call last):
  File "<input>", line 1, in <module>
  File "/home/mp/devel/salt/salt/__init__.py", line 44, in <module>
    from salt.utils import migrations
  File "/home/mp/devel/salt/salt/utils/__init__.py", line 112, in <module>
    import salt.payload
  File "/home/mp/devel/salt/salt/payload.py", line 14, in <module>
    import salt.crypt
  File "/home/mp/devel/salt/salt/crypt.py", line 33, in <module>
    import salt.minion
  File "/home/mp/devel/salt/salt/minion.py", line 60, in <module>
    import salt.client
  File "/home/mp/devel/salt/salt/client/__init__.py", line 38, in <module>
    import salt.utils.event
  File "/home/mp/devel/salt/salt/utils/event.py", line 73, in <module>
    import salt.state
  File "/home/mp/devel/salt/salt/state.py", line 29, in <module>
    import salt.pillar
  File "/home/mp/devel/salt/salt/pillar/__init__.py", line 14, in <module>
    import salt.fileclient
  File "/home/mp/devel/salt/salt/fileclient.py", line 29, in <module>
    import salt.utils.s3
  File "/home/mp/devel/salt/salt/utils/s3.py", line 19, in <module>
    import salt.utils.xmlutil as xml
AttributeError: 'module' object has no attribute 'utils'
>>> 

[TronPaul]

@cachedout what version of salt were you running for your stacktrace on #28740 (comment)? Curious what version the circular import was on. I'm wondering if it might be caused by the import salt.utils.s3 within fileclient.Client.get_url on develop.

[cachedout]

@TronPaul I don't remember at all. Probably the HEAD of develop at the time, but I can't say for sure.

[TronPaul]

@cachedout I think the weirdness might only exist on branches that have the salt.utils.s3 import in the Client.get_url method. I think I'll try and repro on a few different versions without the Client.get_url import, but with the import at the top of the file and vice versa.

[TronPaul]

@cachedout I did see the circular import in the 2014.7 branch. I'm not seeing it in develop or 2015.5 (I removed the import in Client.get_url and ran the highstate I was having problems with). I think if the import in Client.get_url is removed in both those branches, we'll fix the problem seen in #28883. Possibly adding the salt.utils.s3 import to Client.get_url in 2014.7 might fix it there.

I'll open up a PR for 2015.5 and develop. I'm using features that aren't in 2014.7 so I'm not able to test if moving the import to Client.get_url will work.

[cachedout]

@TronPaul OK, I'm going to proceed with your PRs on this one to get things back into working order. We'll need to find another fix for the original motivation behind this PR.

[alangarf]

Got any further with this?

[TronPaul]

@alangarf develop is now working again, and 2015.5 got a backport #29113 as well. I'm not sure what the status of 2014.7 is. My guess is an import of salt.utils.s3 still needs to be added inside the Client.get_url method, though I haven't checked yet.