Squashed commit of the following:

commit b36f9d5 Merge: 8bec1f4 0f868fe Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 12:43:21 2024 +0200 Merge pull request #639 from d-loose/contributing-bug-tracker docs: add bugtracker link to CONTRIBUTING.md commit 8bec1f4 Merge: e54eec3 f2f5487 Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 12:43:13 2024 +0200 Merge pull request #636 from d-loose/non-reportable-errors feat(bootstrap): add support for non reportable errors from subiquity commit f2f5487 Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 11:28:25 2024 +0200 feat(ubuntu_bootstrap): add nonreportableError to tests commit 267db29 Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 11:26:07 2024 +0200 feat(subiquity_test): add nonReportableError to fake commit 56ec94e Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 11:25:06 2024 +0200 feat(subiquity_client): update types commit 0f868fe Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 12:25:06 2024 +0200 docs: add bugtracker link to CONTRIBUTING.md commit e54eec3 Merge: 4b926ec 45d666d Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 12:29:58 2024 +0200 Merge pull request #637 from d-loose/update-mocks chore(init): update mocks commit 45d666d Author: Dennis Loose <dennis.loose@canonical.com> Date: Fri Apr 12 11:41:58 2024 +0200 chore(init): update mocks commit 4b926ec Merge: e115cfc 7b4f90c Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 16:29:34 2024 +0200 Merge pull request #632 from d-loose/xkb-input-source feat(bootstrap): set keyboard via setxkbmap commit 7b4f90c Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 16:18:51 2024 +0200 feat(bootstrap): don't await setxkbmap call commit b866c55 Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 14:54:11 2024 +0200 feat(bootstrap): set keyboard via setxkbmap commit e115cfc Merge: 07eaf67 28f761f Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 16:20:23 2024 +0200 Merge pull request #630 from canonical/renovate/packages-subiquity_client-subiquity-digest chore(deps): update packages/subiquity_client/subiquity digest to 6db2ff8 commit 28f761f Author: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Date: Thu Apr 11 14:02:13 2024 +0000 chore(deps): update packages/subiquity_client/subiquity digest to 6db2ff8 commit 07eaf67 Merge: 5b5d3cf 964fbc4 Author: Matthew Hagemann <93575731+matthew-hagemann@users.noreply.github.com> Date: Thu Apr 11 15:40:05 2024 +0200 Merge pull request #626 from matthew-hagemann/provd-group-and-lc-managment fix(provd): use provd group, not gnome-initial-setup group commit 964fbc4 Author: Matthew Hagemann <matt.hagemann@canonical.com> Date: Thu Apr 11 12:10:31 2024 +0200 fix(provd): use provd group, not gnome-initial-setup group commit 5b5d3cf Merge: ee025ba b5fafa6 Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 13:29:05 2024 +0200 Merge pull request #627 from d-loose/gsettings-input-source feat(bootstrap): set input source directly commit ee025ba Merge: c72429f 111cdb1 Author: Lukas Klingsbo <lukas.klingsbo@gmail.com> Date: Thu Apr 11 13:28:02 2024 +0200 Merge pull request #625 from canonical/fix/flavor-name-in-slides-2 fix: Replace {{ DISTRO }} with flavor name in slides commit b5fafa6 Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 13:02:11 2024 +0200 test(installer_wizard): add mock gsettings commit d7aa186 Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 11:52:57 2024 +0200 refactor: remove duplicate mocks commit ce55002 Author: Dennis Loose <dennis.loose@canonical.com> Date: Thu Apr 11 11:48:49 2024 +0200 feat(bootstrap): set input source via gsettings commit 111cdb1 Author: Lukas Klingsbo <lukas.klingsbo@gmail.com> Date: Thu Apr 11 11:52:38 2024 +0200 chore: Replace Ubuntu with {{ DISTRO }} in slide files commit fe5d60b Author: Lukas Klingsbo <lukas.klingsbo@gmail.com> Date: Thu Apr 11 11:52:17 2024 +0200 fix: Replace {{ DISTRO }} with flavor name in slides
canonical · Apr 12, 2024 · 1962389 · 1962389
1 parent 88aaef5
commit 1962389
Show file tree

Hide file tree

Showing 549 changed files with 1,286 additions and 849 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -13,6 +13,7 @@ These are mostly guidelines, not rules. Use your best judgment, and feel free to
   - [Code of Conduct](#code-of-conduct)
   - [Getting Started](#getting-started)
     - [Pull Requests](#pull-requests)
+  - [Bugs](#bugs)
   - [Translations](#translations)
   - [Contributing to the code](#contributing-to-the-code)
     - [Required dependencies](#required-dependencies)
@@ -50,6 +51,11 @@ In general, we follow the ["fork-and-pull" Git workflow](https://github.com/susa
 
 PRs will trigger unit and integration tests with and without race detection, linting and formatting validations, static and security checks, freshness of generated files verification. All the tests must pass before merging in main branch.
 
+## Bugs
+
+Please report any bugs related to Ubuntu Desktop Provision on [Launchpad](https://bugs.launchpad.net/ubuntu-desktop-provision).
+We use the GitHub issue tracker only for issues related to the development of Ubuntu Desktop Provision itself.
+
 ## Translations
 
 Translations are managed using [Weblate](https://hosted.weblate.org/projects/ubuntu-desktop-translations/)

diff --git a/packages/subiquity_client/lib/src/types.dart b/packages/subiquity_client/lib/src/types.dart
@@ -74,6 +74,18 @@ class ErrorReportRef with _$ErrorReportRef {
       _$ErrorReportRefFromJson(json);
 }
 
+@freezed
+class NonReportableError with _$NonReportableError {
+  const factory NonReportableError({
+    required String cause,
+    required String message,
+    required String? details,
+  }) = _NonReportableError;
+
+  factory NonReportableError.fromJson(Map<String, dynamic> json) =>
+      _$NonReportableErrorFromJson(json);
+}
+
 enum ApplicationState {
   STARTING_UP,
   CLOUD_INIT_WAIT,
@@ -94,6 +106,7 @@ class ApplicationStatus with _$ApplicationStatus {
     required ApplicationState state,
     required String confirmingTty,
     required ErrorReportRef? error,
+    required NonReportableError? nonreportableError,
     required bool? cloudInitOk,
     required bool? interactive,
     required String echoSyslogId,

diff --git a/packages/subiquity_client/lib/src/types.freezed.dart b/packages/subiquity_client/lib/src/types.freezed.dart
@@ -235,6 +235,179 @@ abstract class _ErrorReportRef implements ErrorReportRef {
       throw _privateConstructorUsedError;
 }
 
+NonReportableError _$NonReportableErrorFromJson(Map<String, dynamic> json) {
+  return _NonReportableError.fromJson(json);
+}
+
+/// @nodoc
+mixin _$NonReportableError {
+  String get cause => throw _privateConstructorUsedError;
+  String get message => throw _privateConstructorUsedError;
+  String? get details => throw _privateConstructorUsedError;
+
+  Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
+  @JsonKey(ignore: true)
+  $NonReportableErrorCopyWith<NonReportableError> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
+/// @nodoc
+abstract class $NonReportableErrorCopyWith<$Res> {
+  factory $NonReportableErrorCopyWith(
+          NonReportableError value, $Res Function(NonReportableError) then) =
+      _$NonReportableErrorCopyWithImpl<$Res, NonReportableError>;
+  @useResult
+  $Res call({String cause, String message, String? details});
+}
+
+/// @nodoc
+class _$NonReportableErrorCopyWithImpl<$Res, $Val extends NonReportableError>
+    implements $NonReportableErrorCopyWith<$Res> {
+  _$NonReportableErrorCopyWithImpl(this._value, this._then);
+
+  // ignore: unused_field
+  final $Val _value;
+  // ignore: unused_field
+  final $Res Function($Val) _then;
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? cause = null,
+    Object? message = null,
+    Object? details = freezed,
+  }) {
+    return _then(_value.copyWith(
+      cause: null == cause
+          ? _value.cause
+          : cause // ignore: cast_nullable_to_non_nullable
+              as String,
+      message: null == message
+          ? _value.message
+          : message // ignore: cast_nullable_to_non_nullable
+              as String,
+      details: freezed == details
+          ? _value.details
+          : details // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ) as $Val);
+  }
+}
+
+/// @nodoc
+abstract class _$$NonReportableErrorImplCopyWith<$Res>
+    implements $NonReportableErrorCopyWith<$Res> {
+  factory _$$NonReportableErrorImplCopyWith(_$NonReportableErrorImpl value,
+          $Res Function(_$NonReportableErrorImpl) then) =
+      __$$NonReportableErrorImplCopyWithImpl<$Res>;
+  @override
+  @useResult
+  $Res call({String cause, String message, String? details});
+}
+
+/// @nodoc
+class __$$NonReportableErrorImplCopyWithImpl<$Res>
+    extends _$NonReportableErrorCopyWithImpl<$Res, _$NonReportableErrorImpl>
+    implements _$$NonReportableErrorImplCopyWith<$Res> {
+  __$$NonReportableErrorImplCopyWithImpl(_$NonReportableErrorImpl _value,
+      $Res Function(_$NonReportableErrorImpl) _then)
+      : super(_value, _then);
+
+  @pragma('vm:prefer-inline')
+  @override
+  $Res call({
+    Object? cause = null,
+    Object? message = null,
+    Object? details = freezed,
+  }) {
+    return _then(_$NonReportableErrorImpl(
+      cause: null == cause
+          ? _value.cause
+          : cause // ignore: cast_nullable_to_non_nullable
+              as String,
+      message: null == message
+          ? _value.message
+          : message // ignore: cast_nullable_to_non_nullable
+              as String,
+      details: freezed == details
+          ? _value.details
+          : details // ignore: cast_nullable_to_non_nullable
+              as String?,
+    ));
+  }
+}
+
+/// @nodoc
+@JsonSerializable()
+class _$NonReportableErrorImpl implements _NonReportableError {
+  const _$NonReportableErrorImpl(
+      {required this.cause, required this.message, required this.details});
+
+  factory _$NonReportableErrorImpl.fromJson(Map<String, dynamic> json) =>
+      _$$NonReportableErrorImplFromJson(json);
+
+  @override
+  final String cause;
+  @override
+  final String message;
+  @override
+  final String? details;
+
+  @override
+  String toString() {
+    return 'NonReportableError(cause: $cause, message: $message, details: $details)';
+  }
+
+  @override
+  bool operator ==(Object other) {
+    return identical(this, other) ||
+        (other.runtimeType == runtimeType &&
+            other is _$NonReportableErrorImpl &&
+            (identical(other.cause, cause) || other.cause == cause) &&
+            (identical(other.message, message) || other.message == message) &&
+            (identical(other.details, details) || other.details == details));
+  }
+
+  @JsonKey(ignore: true)
+  @override
+  int get hashCode => Object.hash(runtimeType, cause, message, details);
+
+  @JsonKey(ignore: true)
+  @override
+  @pragma('vm:prefer-inline')
+  _$$NonReportableErrorImplCopyWith<_$NonReportableErrorImpl> get copyWith =>
+      __$$NonReportableErrorImplCopyWithImpl<_$NonReportableErrorImpl>(
+          this, _$identity);
+
+  @override
+  Map<String, dynamic> toJson() {
+    return _$$NonReportableErrorImplToJson(
+      this,
+    );
+  }
+}
+
+abstract class _NonReportableError implements NonReportableError {
+  const factory _NonReportableError(
+      {required final String cause,
+      required final String message,
+      required final String? details}) = _$NonReportableErrorImpl;
+
+  factory _NonReportableError.fromJson(Map<String, dynamic> json) =
+      _$NonReportableErrorImpl.fromJson;
+
+  @override
+  String get cause;
+  @override
+  String get message;
+  @override
+  String? get details;
+  @override
+  @JsonKey(ignore: true)
+  _$$NonReportableErrorImplCopyWith<_$NonReportableErrorImpl> get copyWith =>
+      throw _privateConstructorUsedError;
+}
+
 ApplicationStatus _$ApplicationStatusFromJson(Map<String, dynamic> json) {
   return _ApplicationStatus.fromJson(json);
 }
@@ -244,6 +417,8 @@ mixin _$ApplicationStatus {
   ApplicationState get state => throw _privateConstructorUsedError;
   String get confirmingTty => throw _privateConstructorUsedError;
   ErrorReportRef? get error => throw _privateConstructorUsedError;
+  NonReportableError? get nonreportableError =>
+      throw _privateConstructorUsedError;
   bool? get cloudInitOk => throw _privateConstructorUsedError;
   bool? get interactive => throw _privateConstructorUsedError;
   String get echoSyslogId => throw _privateConstructorUsedError;
@@ -266,13 +441,15 @@ abstract class $ApplicationStatusCopyWith<$Res> {
       {ApplicationState state,
       String confirmingTty,
       ErrorReportRef? error,
+      NonReportableError? nonreportableError,
       bool? cloudInitOk,
       bool? interactive,
       String echoSyslogId,
       String logSyslogId,
       String eventSyslogId});
 
   $ErrorReportRefCopyWith<$Res>? get error;
+  $NonReportableErrorCopyWith<$Res>? get nonreportableError;
 }
 
 /// @nodoc
@@ -291,6 +468,7 @@ class _$ApplicationStatusCopyWithImpl<$Res, $Val extends ApplicationStatus>
     Object? state = null,
     Object? confirmingTty = null,
     Object? error = freezed,
+    Object? nonreportableError = freezed,
     Object? cloudInitOk = freezed,
     Object? interactive = freezed,
     Object? echoSyslogId = null,
@@ -310,6 +488,10 @@ class _$ApplicationStatusCopyWithImpl<$Res, $Val extends ApplicationStatus>
           ? _value.error
           : error // ignore: cast_nullable_to_non_nullable
               as ErrorReportRef?,
+      nonreportableError: freezed == nonreportableError
+          ? _value.nonreportableError
+          : nonreportableError // ignore: cast_nullable_to_non_nullable
+              as NonReportableError?,
       cloudInitOk: freezed == cloudInitOk
           ? _value.cloudInitOk
           : cloudInitOk // ignore: cast_nullable_to_non_nullable
@@ -344,6 +526,19 @@ class _$ApplicationStatusCopyWithImpl<$Res, $Val extends ApplicationStatus>
       return _then(_value.copyWith(error: value) as $Val);
     });
   }
+
+  @override
+  @pragma('vm:prefer-inline')
+  $NonReportableErrorCopyWith<$Res>? get nonreportableError {
+    if (_value.nonreportableError == null) {
+      return null;
+    }
+
+    return $NonReportableErrorCopyWith<$Res>(_value.nonreportableError!,
+        (value) {
+      return _then(_value.copyWith(nonreportableError: value) as $Val);
+    });
+  }
 }
 
 /// @nodoc
@@ -358,6 +553,7 @@ abstract class _$$ApplicationStatusImplCopyWith<$Res>
       {ApplicationState state,
       String confirmingTty,
       ErrorReportRef? error,
+      NonReportableError? nonreportableError,
       bool? cloudInitOk,
       bool? interactive,
       String echoSyslogId,
@@ -366,6 +562,8 @@ abstract class _$$ApplicationStatusImplCopyWith<$Res>
 
   @override
   $ErrorReportRefCopyWith<$Res>? get error;
+  @override
+  $NonReportableErrorCopyWith<$Res>? get nonreportableError;
 }
 
 /// @nodoc
@@ -382,6 +580,7 @@ class __$$ApplicationStatusImplCopyWithImpl<$Res>
     Object? state = null,
     Object? confirmingTty = null,
     Object? error = freezed,
+    Object? nonreportableError = freezed,
     Object? cloudInitOk = freezed,
     Object? interactive = freezed,
     Object? echoSyslogId = null,
@@ -401,6 +600,10 @@ class __$$ApplicationStatusImplCopyWithImpl<$Res>
           ? _value.error
           : error // ignore: cast_nullable_to_non_nullable
               as ErrorReportRef?,
+      nonreportableError: freezed == nonreportableError
+          ? _value.nonreportableError
+          : nonreportableError // ignore: cast_nullable_to_non_nullable
+              as NonReportableError?,
       cloudInitOk: freezed == cloudInitOk
           ? _value.cloudInitOk
           : cloudInitOk // ignore: cast_nullable_to_non_nullable
@@ -432,6 +635,7 @@ class _$ApplicationStatusImpl implements _ApplicationStatus {
       {required this.state,
       required this.confirmingTty,
       required this.error,
+      required this.nonreportableError,
       required this.cloudInitOk,
       required this.interactive,
       required this.echoSyslogId,
@@ -448,6 +652,8 @@ class _$ApplicationStatusImpl implements _ApplicationStatus {
   @override
   final ErrorReportRef? error;
   @override
+  final NonReportableError? nonreportableError;
+  @override
   final bool? cloudInitOk;
   @override
   final bool? interactive;
@@ -460,7 +666,7 @@ class _$ApplicationStatusImpl implements _ApplicationStatus {
 
   @override
   String toString() {
-    return 'ApplicationStatus(state: $state, confirmingTty: $confirmingTty, error: $error, cloudInitOk: $cloudInitOk, interactive: $interactive, echoSyslogId: $echoSyslogId, logSyslogId: $logSyslogId, eventSyslogId: $eventSyslogId)';
+    return 'ApplicationStatus(state: $state, confirmingTty: $confirmingTty, error: $error, nonreportableError: $nonreportableError, cloudInitOk: $cloudInitOk, interactive: $interactive, echoSyslogId: $echoSyslogId, logSyslogId: $logSyslogId, eventSyslogId: $eventSyslogId)';
   }
 
   @override
@@ -472,6 +678,8 @@ class _$ApplicationStatusImpl implements _ApplicationStatus {
             (identical(other.confirmingTty, confirmingTty) ||
                 other.confirmingTty == confirmingTty) &&
             (identical(other.error, error) || other.error == error) &&
+            (identical(other.nonreportableError, nonreportableError) ||
+                other.nonreportableError == nonreportableError) &&
             (identical(other.cloudInitOk, cloudInitOk) ||
                 other.cloudInitOk == cloudInitOk) &&
             (identical(other.interactive, interactive) ||
@@ -486,8 +694,17 @@ class _$ApplicationStatusImpl implements _ApplicationStatus {
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, state, confirmingTty, error,
-      cloudInitOk, interactive, echoSyslogId, logSyslogId, eventSyslogId);
+  int get hashCode => Object.hash(
+      runtimeType,
+      state,
+      confirmingTty,
+      error,
+      nonreportableError,
+      cloudInitOk,
+      interactive,
+      echoSyslogId,
+      logSyslogId,
+      eventSyslogId);
 
   @JsonKey(ignore: true)
   @override
@@ -509,6 +726,7 @@ abstract class _ApplicationStatus implements ApplicationStatus {
       {required final ApplicationState state,
       required final String confirmingTty,
       required final ErrorReportRef? error,
+      required final NonReportableError? nonreportableError,
       required final bool? cloudInitOk,
       required final bool? interactive,
       required final String echoSyslogId,
@@ -525,6 +743,8 @@ abstract class _ApplicationStatus implements ApplicationStatus {
   @override
   ErrorReportRef? get error;
   @override
+  NonReportableError? get nonreportableError;
+  @override
   bool? get cloudInitOk;
   @override
   bool? get interactive;