1
diff --git a/debian/changelog b/debian/changelog
2
index 0cf9bd5..2487bde 100644
3
--- a/debian/changelog
4
+++ b/debian/changelog
5
@@ -1,3 +1,12 @@
6
1
software-properties (0.99.13.1) impish; urgency=medium
7
2
8
3
  * utils: prefer /var/lib/ubuntu-advantage/status.json over ua status
9
4
    - Handle absent /var/lib/ubuntu-advantage/status.json for non-root
10
5
      users (LP: #1939732)
11
6
    - print unexcepted errors and if _schema_version not equal to 0.1
12
7
13
8
 -- Chad Smith <chad.smith@canonical.com>  Mon, 01 Nov 2021 11:42:27 -0600
14
9
15
1
software-properties (0.99.13) impish; urgency=medium
10
software-properties (0.99.13) impish; urgency=medium
16
2
11
17
3
  * Catch exception if UA status file is not written
12
  * Catch exception if UA status file is not written
18
diff --git a/softwareproperties/gtk/utils.py b/softwareproperties/gtk/utils.py
19
index d478671..522faa0 100644
20
--- a/softwareproperties/gtk/utils.py
21
+++ b/softwareproperties/gtk/utils.py
22
@@ -26,6 +26,7 @@ import gi
23
26
gi.require_version("Gtk", "3.0")
26
gi.require_version("Gtk", "3.0")
24
27
from gi.repository import Gio, Gtk
27
from gi.repository import Gio, Gtk
25
28
import json
28
import json
26
29
import os
27
29
import subprocess
30
import subprocess
28
30
31
29
31
import logging
32
import logging
30
@@ -73,37 +74,52 @@ def current_distro():
31
73
        if release.series == distro.codename:
74
        if release.series == distro.codename:
32
74
            return release
75
            return release
33
75
76
34
77
35
76
def get_ua_status():
78
def get_ua_status():
36
77
    """Return a dict of all UA status information or empty dict on error."""
79
    """Return a dict of all UA status information or empty dict on error."""
49
78
    # status.json will exist on any attached system or any unattached system
80
    # status.json will exist on any attached system. It will also be created
50
79
    # which has already run `ua status`. Calling ua status directly on
81
    # by the systemd timer ua-timer which will update UA_STATUS_JSON every 12
51
80
    # network disconnected machines will raise a TimeoutException trying to
82
    # hours to reflect current status of UA subscription services.
52
81
    # access contracts.canonical.com/v1/resources.
83
    # Invoking `ua status` with subp will result in a network call to
53
82
    try:
84
    # contracts.canonical.com which could raise Timeouts on network limited
54
83
        # Success writes UA_STATUS_JSON
85
    # machines. So, prefer the status.json file when possible.
55
84
        result = subprocess.run(['ua', 'status', '--format=json'], capture_output=True)
86
    status_json = ""
56
85
    except Exception as e:
87
    if os.path.exists(UA_STATUS_JSON):
57
86
        print("Failed to call ubuntu advantage client:\n%s" % e)
88
        with open(UA_STATUS_JSON) as stream:
58
87
        return {}
89
            status_json = stream.read()
59
88
    if result.returncode != 0:
90
    else:
60
89
        print("Ubuntu advantage client returned code %d" % result.returncode)
91
        try:
61
92
            # Success writes UA_STATUS_JSON
62
93
            result = subprocess.run(
63
94
                ['ua', 'status', '--format=json'], stdout=subprocess.PIPE
64
95
            )
65
96
        except Exception as e:
66
97
            print("Failed to run `ua status`:\n%s" % e)
67
98
            return {}
68
99
        if result.returncode != 0:
69
100
            print(
70
101
                "Ubuntu Advantage client returned code %d" % result.returncode
71
102
            )
72
103
            return {}
73
104
        status_json = result.stdout
74
105
    if not status_json:
75
106
        print(
76
107
            "Warning: no Ubuntu Advantage status found."
77
108
            " Is ubuntu-advantage-tools installed?"
78
109
        )
79
90
        return {}
110
        return {}
80
91
81
92
    try:
82
93
        status_file = open(UA_STATUS_JSON, "r")
83
94
    except Exception as e:
84
95
        print("No ua status file written:\n%s" % e)
85
96
        return {}
86
97
87
98
    with status_file as stream:
88
99
        status_json = stream.read()
89
100
    try:
111
    try:
90
101
        status = json.loads(status_json)
112
        status = json.loads(status_json)
91
102
    except json.JSONDecodeError as e:
113
    except json.JSONDecodeError as e:
92
103
        print("Failed to parse ubuntu advantage client JSON:\n%s" % e)
114
        print("Failed to parse ubuntu advantage client JSON:\n%s" % e)
93
104
        return {}
115
        return {}
94
116
    if status.get("_schema_version", "0.1") != "0.1":
95
117
        print(
96
118
            "UA status schema version change: %s" % status["_schema_version"]
97
119
        )
98
105
    return status
120
    return status
99
106
121
100
122
101
107
def get_ua_service_status(service_name='esm-infra', status=None):
123
def get_ua_service_status(service_name='esm-infra', status=None):
102
108
    """Get service availability and status for a specific UA service.
124
    """Get service availability and status for a specific UA service.
103
109
125
104
@@ -112,26 +128,27 @@ def get_ua_service_status(service_name='esm-infra', status=None):
105
112
        - attached contract is entitled to the service
128
        - attached contract is entitled to the service
106
113
        - unattached machine reports service "availability" as "yes"
129
        - unattached machine reports service "availability" as "yes"
107
114
      :str service_status: will be one of the following:
130
      :str service_status: will be one of the following:
109
115
        - "disabled" when the service is available but not active
131
        - "disabled" when the service is available and applicable but not
110
132
          active
111
116
        - "enabled" when the service is available and active
133
        - "enabled" when the service is available and active
113
117
        - "n/a" when the service is not applicable on the environment or not
134
        - "n/a" when the service is not applicable to the environment or not
114
118
          entitled for the attached contract
135
          entitled for the attached contract
115
119
    """
136
    """
116
120
    if not status:
137
    if not status:
117
121
        status = get_ua_status()
138
        status = get_ua_status()
118
139
    # Assume unattached on empty status dict
119
122
    available = False
140
    available = False
120
123
    service_status = "n/a"
141
    service_status = "n/a"
121
124
    for service in status.get("services", []):
142
    for service in status.get("services", []):
130
125
        if service.get("name") == service_name:
143
        if service.get("name") != service_name:
131
126
            if service.get("available"):  # then we are not attached
144
            continue
132
127
                if service["available"] == "yes":
145
        if "available" in service:
133
128
                     available = True
146
            available = bool("yes" == service["available"])
134
129
                     service_status = "disabled"  # Disabled since unattached
147
        if "status" in service:
135
130
            else:  # attached
148
            service_status = service["status"]  # enabled, disabled or n/a
128
131
                available = service.get("entitled") == "yes"
129
132
                service_status = service.get("status")  # Will be enabled, disabled or n/a
136
133
    return (available, service_status)
149
    return (available, service_status)
137
134
150
138
151
139
135
def retry(exceptions, tries=10, delay=0.1, backoff=2):
152
def retry(exceptions, tries=10, delay=0.1, backoff=2):
140
136
    """
153
    """
141
137
    Retry calling the decorated function using an exponential backoff.
154
    Retry calling the decorated function using an exponential backoff.
Status:	Merged
Merged at revision:	cf0e4d7a9c528fb90cd7b8596e94e17bd5d3eac4
Proposed branch:	~chad.smith/software-properties:ua-status-from-json-impish
Merge into:	software-properties:ubuntu/impish
Diff against target:	141 lines (+57/-31) 2 files modified debian/changelog (+9/-0) softwareproperties/gtk/utils.py (+48/-31)
Related bugs:	Link a bug report
Reviewer	Date Requested	Status
Corey Bryant		Approve on 2021-11-01
Grant Orndorff	2021-11-01	Pending
Lucas Albuquerque Medeiros de Moura	2021-11-01	Pending
Robert Ancell	2021-11-01	Pending
Review via email: mp+411092@code.launchpad.net